Skip to content

Commit

Permalink
Merge pull request #1623 from CDCgov/combine-docker-files
Browse files Browse the repository at this point in the history
Combined docker files
  • Loading branch information
jherrflexion authored Dec 2, 2024
2 parents 364c460 + 5e0607b commit 421711f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 24 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ creates a `.env` file in the resource folder with the required configuration

### Using a local database

Use [docker-compose.postgres.yml](docker-compose.postgres.yml) to run your local DB. In IntelliJ, you can click the play arrow to start it
Use [docker-compose.yml](docker-compose.yml) to run your local DB. In IntelliJ, you can click the play arrow to start it

![docker-postgres.png](images/docker-postgres.png)

Expand Down Expand Up @@ -466,3 +466,8 @@ Please refer to [CDC's Template Repository](https://github.com/CDCgov/template)
for more information about [contributing to this repository](https://github.com/CDCgov/template/blob/master/CONTRIBUTING.md),
[public domain notices and disclaimers](https://github.com/CDCgov/template/blob/master/DISCLAIMER.md),
and [code of conduct](https://github.com/CDCgov/template/blob/master/code-of-conduct.md).

### Troubleshooting

Error: copier: stat: "/app/build/libs/app-all.jar": no such file or directory
Solution: Run ./gradlew shadowjar first
23 changes: 0 additions & 23 deletions docker-compose.postgres.yml

This file was deleted.

22 changes: 22 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Run the following to migrate...
# liquibase update --changelog-file ./etor/databaseMigrations/root.yml --url jdbc:postgresql://localhost:5433/intermediary --username intermediary --password 'changeIT!' --label-filter '!azure'

# Run the following to rollback...
# liquibase rollback-count --changelog-file ./etor/databaseMigrations/root.yml --url jdbc:postgresql://localhost:5433/intermediary --username intermediary --password 'changeIT!' --count 2


version: "3.7"
services:
router:
Expand All @@ -7,3 +14,18 @@ services:
ports:
- "8080:8080" # default api endpoint port
- "6006:6006" # Java debug port

postgresql:
image: postgres:16
restart: unless-stopped
environment:
POSTGRES_DB: "intermediary"
POSTGRES_PASSWORD: "changeIT!" # pragma: allowlist secret
POSTGRES_USER: "intermediary"
ports:
- 5433:5432
volumes:
- ti_postgres_data:/var/lib/postgresql/data

volumes:
ti_postgres_data:

0 comments on commit 421711f

Please sign in to comment.