diff --git a/c4/docker-compose.yml b/c4/docker-compose.yml index 52d389c..1860f79 100644 --- a/c4/docker-compose.yml +++ b/c4/docker-compose.yml @@ -10,7 +10,6 @@ volumes: services: traefik: - container_name: traefik image: traefik:2.4 command: - --api.insecure=true @@ -25,7 +24,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro landing: - container_name: landingpage image: nginx:stable volumes: - ../landing/:/usr/share/nginx/html @@ -73,7 +71,6 @@ services: restart: always id-manager: - container_name: id-manager image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop environment: MAGICPL_SITE: ${SITE} @@ -100,7 +97,6 @@ services: - "traefik.http.services.idmanager.loadbalancer.server.port=8080" patientlist: - container_name: patientlist image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop environment: ML_SITE: ${SITE} @@ -120,7 +116,6 @@ services: - patientlist-db patientlist-db: - container_name: patientlist-db image: postgres:13.1-alpine environment: POSTGRES_DB: mainzelliste diff --git a/dktk/docker-compose.yml b/dktk/docker-compose.yml index df297b7..26600d1 100644 --- a/dktk/docker-compose.yml +++ b/dktk/docker-compose.yml @@ -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" volumes: dktk-connector-db-data: @@ -8,7 +9,6 @@ volumes: services: traefik: - container_name: traefik image: traefik:2.4 command: - --api.insecure=true @@ -23,7 +23,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro landing: - container_name: landingpage image: nginx:stable volumes: - ../landing/:/usr/share/nginx/html @@ -69,7 +68,6 @@ services: restart: always id-manager: - container_name: id-manager image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop environment: MAGICPL_SITE: ${SITE} @@ -96,7 +94,6 @@ services: - "traefik.http.services.id-manager.loadbalancer.server.port=8080" patientlist: - container_name: patientlist image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop environment: ML_SITE: ${SITE} @@ -116,7 +113,6 @@ services: - patientlist-db patientlist-db: - container_name: patientlist-db image: postgres:13.1-alpine environment: POSTGRES_DB: mainzelliste diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 5809ae7..10ed4cd 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -7,7 +7,6 @@ volumes: services: traefik: - container_name: traefik image: traefik:2.4 command: - --api.insecure=true @@ -22,7 +21,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro landing: - container_name: landingpage image: nginx:stable volumes: - ../landing/:/usr/share/nginx/html @@ -35,7 +33,6 @@ services: image: "samply/share-client:gbn-feature-environmentPreconfigurationTorben" environment: POSTGRES_HOST: "gbn-connector-db" - ID_MANAGER_APIKEY: ${MAGICPL_API_KEY_CONNECTOR} POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} HTTP_PROXY_USER: ${HTTP_PROXY_USER} HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD}