Merge pull request #152 from gluap/proper_deps

switch from link to depends_on
This commit is contained in:
gluap 2021-12-25 22:51:36 +01:00 committed by GitHub
commit ee6163b301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -26,8 +26,10 @@ services:
- ./config/config.py:/opt/obs/api/config.py - ./config/config.py:/opt/obs/api/config.py
- ./data/tiles/:/tiles - ./data/tiles/:/tiles
restart: on-failure restart: on-failure
links: depends_on:
- postgres - postgres
# if you introduce a dockerized keycloak instance within this compose also:
# - keycloak
labels: labels:
- traefik.http.routers.portal.rule=Host(`portal.example.com`) - traefik.http.routers.portal.rule=Host(`portal.example.com`)
- traefik.http.routers.portal.entrypoints=websecure - traefik.http.routers.portal.entrypoints=websecure

View file

@ -32,7 +32,7 @@ services:
- ./tile-generator:/opt/obs/tile-generator - ./tile-generator:/opt/obs/tile-generator
- ./local/api-data:/data - ./local/api-data:/data
- ./tile-generator/data/:/tiles - ./tile-generator/data/:/tiles
links: depends_on:
- postgres - postgres
- keycloak - keycloak
ports: ports:
@ -52,7 +52,7 @@ services:
- ./api/tools:/opt/obs/api/tools - ./api/tools:/opt/obs/api/tools
- ./api/config.dev.py:/opt/obs/api/config.py - ./api/config.dev.py:/opt/obs/api/config.py
- ./local/api-data:/data - ./local/api-data:/data
links: depends_on:
- postgres - postgres
- keycloak - keycloak
restart: on-failure restart: on-failure
@ -70,7 +70,7 @@ services:
- ./frontend/tsconfig.json:/opt/obs/frontend/tsconfig.json - ./frontend/tsconfig.json:/opt/obs/frontend/tsconfig.json
- ./frontend/package.json:/opt/obs/frontend/package.json - ./frontend/package.json:/opt/obs/frontend/package.json
- ./frontend/webpack.config.js:/opt/obs/frontend/webpack.config.js - ./frontend/webpack.config.js:/opt/obs/frontend/webpack.config.js
links: depends_on:
- api - api
environment: environment:
# used for proxy only # used for proxy only
@ -86,7 +86,7 @@ services:
image: jboss/keycloak image: jboss/keycloak
ports: ports:
- 3003:8080 - 3003:8080
links: depends_on:
- postgres - postgres
environment: environment:
KEYCLOAK_USER: admin KEYCLOAK_USER: admin