diff --git a/README.md b/README.md index c649125a0..9e276e6fe 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml deleted file mode 100644 index 6db2c8fd9..000000000 --- a/docker-compose.postgres.yml +++ /dev/null @@ -1,23 +0,0 @@ -# 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: - postgresql: - image: postgres:16 - restart: unless-stopped - environment: - POSTGRES_DB: "intermediary" - POSTGRES_PASSWORD: "changeIT!" - POSTGRES_USER: "intermediary" - ports: - - 5433:5432 - volumes: - - ti_postgres_data:/var/lib/postgresql/data - -volumes: - ti_postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index 38accc987..b93306424 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: @@ -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: