fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(docker): allow backend container to connect to database container

Browse Source
This commit is contained in:
Sarah Vaupel 2024-09-22 02:37:38 +02:00
parent 052c361f1d
commit 20552032de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -214,7 +214,7 @@ database-%:
.PHONY: --containerized-database .PHONY: --containerized-database
--containerized-database: FRADRIVE_SERVICE=database --containerized-database: FRADRIVE_SERVICE=database
# port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons # port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
--containerized-database: CONTAINER_PORTS=-p 127.0.0.1:5432:5432/tcp --containerized-database: CONTAINER_PORTS=-p 5432:5432/tcp
--containerized-database: --image-build --containerized-database: --image-build
if [ "$(IN_CONTAINER)" == "false" ] ; then \ if [ "$(IN_CONTAINER)" == "false" ] ; then \
$(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \ $(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \

2
config/settings.yml
View File

@ -123,7 +123,7 @@ auth-pw-hash:
database: database:
user: "_env:PGUSER:uniworx" user: "_env:PGUSER:uniworx"
password: "_env:PGPASS:uniworx" password: "_env:PGPASS:uniworx"
host: "_env:PGHOST:127.0.0.1" host: "_env:PGHOST:host.docker.internal"
port: "_env:PGPORT:5432" port: "_env:PGPORT:5432"
# See config/test-settings.yml for an override during tests # See config/test-settings.yml for an override during tests
database: "_env:PGDATABASE:uniworx" database: "_env:PGDATABASE:uniworx"