From 020e9a2609288ed9e4ca3268162e67749e5cba72 Mon Sep 17 00:00:00 2001 From: Brian Frost Date: Wed, 28 Aug 2024 14:43:49 -0700 Subject: [PATCH] ACAS-799: follow-up fix for docker bob script --- README.md | 14 +++++++------- docker_bob_setup.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 30c8e2a6a..779ee9f55 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ cp -r chemaxon/marvinjs ``` cd ~/Documents/mcneilco/oss/acas -docker-compose up -d +docker compose up -d ``` #### Login @@ -175,25 +175,25 @@ This will create a user "bob" with password "secret". #### Viewing logs ``` -docker-compose logs --tail=20 -f +docker compose logs --tail=20 -f ``` 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 @@ -201,7 +201,7 @@ docker-compose down * 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 index 3d5428931..f04ecd262 100755 --- 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 \ No newline at end of file +docker compose logs \ No newline at end of file