Skip to content

Commit

Permalink
Merge pull request #152 from gluap/proper_deps
Browse files Browse the repository at this point in the history
switch from link to depends_on
  • Loading branch information
gluap authored Dec 25, 2021
2 parents 057e2bc + 442143a commit ee6163b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion deployment/examples/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ services:
- ./config/config.py:/opt/obs/api/config.py
- ./data/tiles/:/tiles
restart: on-failure
links:
depends_on:
- postgres
# if you introduce a dockerized keycloak instance within this compose also:
# - keycloak
labels:
- traefik.http.routers.portal.rule=Host(`portal.example.com`)
- traefik.http.routers.portal.entrypoints=websecure
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- ./tile-generator:/opt/obs/tile-generator
- ./local/api-data:/data
- ./tile-generator/data/:/tiles
links:
depends_on:
- postgres
- keycloak
ports:
Expand All @@ -52,7 +52,7 @@ services:
- ./api/tools:/opt/obs/api/tools
- ./api/config.dev.py:/opt/obs/api/config.py
- ./local/api-data:/data
links:
depends_on:
- postgres
- keycloak
restart: on-failure
Expand All @@ -70,7 +70,7 @@ services:
- ./frontend/tsconfig.json:/opt/obs/frontend/tsconfig.json
- ./frontend/package.json:/opt/obs/frontend/package.json
- ./frontend/webpack.config.js:/opt/obs/frontend/webpack.config.js
links:
depends_on:
- api
environment:
# used for proxy only
Expand All @@ -86,7 +86,7 @@ services:
image: jboss/keycloak
ports:
- 3003:8080
links:
depends_on:
- postgres
environment:
KEYCLOAK_USER: admin
Expand Down

0 comments on commit ee6163b

Please sign in to comment.