verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Removed container_name from all services

This commit is contained in:
Torben Brenner 2022-03-01 08:51:42 +01:00
parent 26b7e272bf
commit d02170f266
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
c4/docker-compose.yml
View File

@ -10,7 +10,6 @@ volumes:
services: services:
traefik: traefik:
container_name: traefik
image: traefik:2.4 image: traefik:2.4
command: command:
- --api.insecure=true - --api.insecure=true
@ -25,7 +24,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
landing: landing:
container_name: landingpage
image: nginx:stable image: nginx:stable
volumes: volumes:
- ../landing/:/usr/share/nginx/html - ../landing/:/usr/share/nginx/html
@ -73,7 +71,6 @@ services:
restart: always restart: always
id-manager: id-manager:
container_name: id-manager
image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop
environment: environment:
MAGICPL_SITE: ${SITE} MAGICPL_SITE: ${SITE}
@ -100,7 +97,6 @@ services:
- "traefik.http.services.idmanager.loadbalancer.server.port=8080" - "traefik.http.services.idmanager.loadbalancer.server.port=8080"
patientlist: patientlist:
container_name: patientlist
image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop
environment: environment:
ML_SITE: ${SITE} ML_SITE: ${SITE}
@ -120,7 +116,6 @@ services:
- patientlist-db - patientlist-db
patientlist-db: patientlist-db:
container_name: patientlist-db
image: postgres:13.1-alpine image: postgres:13.1-alpine
environment: environment:
POSTGRES_DB: mainzelliste POSTGRES_DB: mainzelliste

6
dktk/docker-compose.yml
View File

@ -1,3 +1,4 @@
# TODO: Is there a reason why the docker-compose files are not at root level? e.g. docker-compose.(dktk|gbn|c4).yml
version: "3.7" version: "3.7"
volumes: volumes:
dktk-connector-db-data: dktk-connector-db-data:
@ -8,7 +9,6 @@ volumes:
services: services:
traefik: traefik:
container_name: traefik
image: traefik:2.4 image: traefik:2.4
command: command:
- --api.insecure=true - --api.insecure=true
@ -23,7 +23,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
landing: landing:
container_name: landingpage
image: nginx:stable image: nginx:stable
volumes: volumes:
- ../landing/:/usr/share/nginx/html - ../landing/:/usr/share/nginx/html
@ -69,7 +68,6 @@ services:
restart: always restart: always
id-manager: id-manager:
container_name: id-manager
image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop
environment: environment:
MAGICPL_SITE: ${SITE} MAGICPL_SITE: ${SITE}
@ -96,7 +94,6 @@ services:
- "traefik.http.services.id-manager.loadbalancer.server.port=8080" - "traefik.http.services.id-manager.loadbalancer.server.port=8080"
patientlist: patientlist:
container_name: patientlist
image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop
environment: environment:
ML_SITE: ${SITE} ML_SITE: ${SITE}
@ -116,7 +113,6 @@ services:
- patientlist-db - patientlist-db
patientlist-db: patientlist-db:
container_name: patientlist-db
image: postgres:13.1-alpine image: postgres:13.1-alpine
environment: environment:
POSTGRES_DB: mainzelliste POSTGRES_DB: mainzelliste

3
gbn/docker-compose.yml
View File

@ -7,7 +7,6 @@ volumes:
services: services:
traefik: traefik:
container_name: traefik
image: traefik:2.4 image: traefik:2.4
command: command:
- --api.insecure=true - --api.insecure=true
@ -22,7 +21,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
landing: landing:
container_name: landingpage
image: nginx:stable image: nginx:stable
volumes: volumes:
- ../landing/:/usr/share/nginx/html - ../landing/:/usr/share/nginx/html
@ -35,7 +33,6 @@ services:
image: "samply/share-client:gbn-feature-environmentPreconfigurationTorben" image: "samply/share-client:gbn-feature-environmentPreconfigurationTorben"
environment: environment:
POSTGRES_HOST: "gbn-connector-db" POSTGRES_HOST: "gbn-connector-db"
ID_MANAGER_APIKEY: ${MAGICPL_API_KEY_CONNECTOR}
POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
HTTP_PROXY_USER: ${HTTP_PROXY_USER} HTTP_PROXY_USER: ${HTTP_PROXY_USER}
HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD} HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD}