Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Combined docker files #1623

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Combined docker files #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the documentation to reflect the removal of 'docker-compose.postgres.yml' and ensure all references are correctly pointing to 'docker-compose.yml'. This helps in maintaining accurate and useful documentation. [important]


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

Expand Down
23 changes: 0 additions & 23 deletions docker-compose.postgres.yml
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions docker-compose.yml
View file
Open in desktop
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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's recommended to avoid using 'unless-stopped' for the restart policy of containers in production environments. Consider using 'always' or a specific restart policy that aligns with your deployment strategy. [medium]

environment:
POSTGRES_DB: "intermediary"
POSTGRES_PASSWORD: "changeIT!" # pragma: allowlist secret
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using environment variables for database credentials to enhance security. This can be done by setting up environment variables in your CI/CD pipeline or local environment, and referencing them in the docker-compose file. [important]

POSTGRES_USER: "intermediary"
ports:
- 5433:5432
volumes:
- ti_postgres_data:/var/lib/postgresql/data

volumes:
ti_postgres_data: