Skip to content

Commit

Permalink
ACAS-799: follow-up fix for docker bob script
Browse files Browse the repository at this point in the history
  • Loading branch information
bffrost committed Sep 27, 2024
1 parent a8183c9 commit 020e9a2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}/
Expand Down
2 changes: 1 addition & 1 deletion docker_bob_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 020e9a2

Please sign in to comment.