Merge pull request #1187 from mcneilco/release/2024.2.x

⬆️ Upmerge release/2024.2.x to release/2024.3.x
mcneilco · Sep 27, 2024 · 0593171 · 0593171
2 parents 2168431 + 020e9a2
commit 0593171
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -74,11 +74,11 @@ jobs:
             BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             VERSION=${{ env.ACAS_TAG }}
             REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-      - name: Run docker-compose up - assumes racas-oss:${{ env.ACAS_TAG }} and acas-roo-server-oss:${{ env.ACAS_TAG }}-indigo exist and are up to date
+      - name: Run docker compose up - assumes racas-oss:${{ env.ACAS_TAG }} and acas-roo-server-oss:${{ env.ACAS_TAG }}-indigo exist and are up to date
         id: dockerComposeUp
         run: |
           echo "docker_compose_pull_failure=false" >> $GITHUB_OUTPUT
-          docker-compose -f "docker-compose.yml" up -d || echo "docker_compose_pull_failure=true" >> $GITHUB_OUTPUT
+          docker compose -f "docker-compose.yml" up -d || echo "docker_compose_pull_failure=true" >> $GITHUB_OUTPUT
       - name: Get docker images fallback tag name
         run: |
           echo "DEFAULT_BRANCH_ACAS_TAG=$(echo ${{ github.event.repository.default_branch }} | sed -e 's/\//-/g')" >> $GITHUB_ENV
@@ -89,7 +89,7 @@ jobs:
           docker tag mcneilco/acas-roo-server-oss:${{ env.DEFAULT_BRANCH_ACAS_TAG}}-indigo mcneilco/acas-roo-server-oss:${{ env.ACAS_TAG }}-indigo
           docker pull  mcneilco/racas-oss:${{ env.DEFAULT_BRANCH_ACAS_TAG}}
           docker tag mcneilco/racas-oss:${{ env.DEFAULT_BRANCH_ACAS_TAG }} mcneilco/racas-oss:${{ env.ACAS_TAG }}
-          docker-compose -f "docker-compose.yml" up -d
+          docker compose -f "docker-compose.yml" up -d
         if: ${{ steps.dockerComposeUp.outputs.docker_compose_pull_failure == 'true' }}
       - name: Create docker bob
         run: bash docker_bob_setup.sh

diff --git a/README.md b/README.md
@@ -153,7 +153,7 @@ cp -r <path/to/marvinjs-16.10.17-all> chemaxon/marvinjs
 
 ```
 cd ~/Documents/mcneilco/oss/acas
-docker-compose up -d
+docker compose up -d
 ```
 
 #### Login
@@ -175,33 +175,33 @@ This will create a user "bob" with password "secret".
 #### Viewing logs
 
 ```
-docker-compose logs --tail=20 -f <service>
+docker compose logs --tail=20 -f <service>
 ```
 
 e.g. for all containers
 
 ```
-docker-compose logs -f 
+docker compose logs -f 
 ```
 
 e.g. for only tomcat
 
 ```
-docker-compose logs --tail=20 -f tomcat
+docker compose logs --tail=20 -f tomcat
 ```
 
 Stop the web stack
 
 ```bash
-docker-compose down
+docker compose down
 ```
 
 #### Troubleshooting
 
 * There is a known timing issue where tomcat may try to connect to the database before the database is accepting connections.  If this happens, try restarting tomcat.
 
 ```
-docker-compose restart tomcat
+docker compose restart tomcat
 ```
 
 ## Configuration
@@ -245,7 +245,7 @@ ACAS_SERVER_DATAFILES_RELATIVE__PATH=..
 ##### Override containing configs which will be replaced with other configs
 Replaces `client.service.cmpdReg.persistence.fullpath`
 
-docker-compose example which requires `$$` to esacpe the `$` override
+docker compose example which requires `$$` to esacpe the `$` override
 ```
 environment:
   - ACAS_CLIENT_SERVICE_CMPDREG_PERSISTENCE_FULLPATH=http://$${client.service.cmpdReg.persistence.host}:$${client.service.persistence.port}/$${client.service.cmpdReg.persistence.path}/

diff --git a/docker_bob_setup.sh b/docker_bob_setup.sh
@@ -22,4 +22,4 @@ else
     # giveBobRoles
     curl --max-time 5 -i -X GET -H "Accept: application/json" http://localhost:3001/api/systemTest/giveBobRoles
 fi
-docker-compose logs
+docker compose logs