From 33b50372c6d264ce17811656ab2b2d74bf846404 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Thu, 9 Mar 2023 11:16:34 +0100 Subject: [PATCH] Pull docker images from DKFZ mirror --- bbmri/docker-compose.yml | 12 ++++++------ ccp/docker-compose.yml | 12 ++++++------ ccp/exliquid-compose.yml | 4 ++-- ccp/modules/id-management-compose.yml | 2 +- ccp/mtba-compose.yml | 2 +- ccp/nngm-compose.yml | 2 +- lib/functions.sh | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 89ed1a9..6a6d0a8 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: container_name: bridgehead-traefik - image: traefik:latest + image: docker.verbis.dkfz.de/cache/traefik:latest command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 @@ -32,7 +32,7 @@ services: forward_proxy: container_name: bridgehead-forward-proxy - image: samply/bridgehead-forward-proxy:latest + image: docker.verbis.dkfz.de/cache/samply/bridgehead-forward-proxy:latest environment: HTTPS_PROXY: ${HTTPS_PROXY_URL} USERNAME: ${HTTPS_PROXY_USERNAME} @@ -42,7 +42,7 @@ services: landing: container_name: bridgehead-landingpage - image: samply/bridgehead-landingpage:master + image: docker.verbis.dkfz.de/cache/samply/bridgehead-landingpage:master labels: - "traefik.enable=true" - "traefik.http.routers.landing.rule=PathPrefix(`/`)" @@ -54,7 +54,7 @@ services: SITE_NAME: ${SITE_NAME} blaze: - image: "samply/blaze:0.19" + image: docker.verbis.dkfz.de/cache/samply/blaze:0.19 container_name: bridgehead-bbmri-blaze environment: BASE_URL: "http://bridgehead-bbmri-blaze:8080" @@ -72,7 +72,7 @@ services: - "traefik.http.routers.blaze_ccp.tls=true" spot: - image: samply/spot:latest + image: docker.verbis.dkfz.de/cache/samply/spot:latest container_name: bridgehead-spot environment: SECRET: ${SPOT_BEAM_SECRET_LONG} @@ -85,7 +85,7 @@ services: - "blaze" beam-proxy: - image: samply/beam-proxy:develop + image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 65e57d2..209ee70 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: container_name: bridgehead-traefik - image: traefik:latest + image: docker.verbis.dkfz.de/cache/traefik:latest command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 @@ -32,7 +32,7 @@ services: forward_proxy: container_name: bridgehead-forward-proxy - image: samply/bridgehead-forward-proxy:latest + image: docker.verbis.dkfz.de/cache/samply/bridgehead-forward-proxy:latest environment: HTTPS_PROXY: ${HTTPS_PROXY_URL} USERNAME: ${HTTPS_PROXY_USERNAME} @@ -42,7 +42,7 @@ services: landing: container_name: bridgehead-landingpage - image: samply/bridgehead-landingpage:master + image: docker.verbis.dkfz.de/cache/samply/bridgehead-landingpage:master labels: - "traefik.enable=true" - "traefik.http.routers.landing.rule=PathPrefix(`/`)" @@ -54,7 +54,7 @@ services: SITE_NAME: ${SITE_NAME} blaze: - image: "samply/blaze:0.19" + image: docker.verbis.dkfz.de/cache/samply/blaze:0.19 container_name: bridgehead-ccp-blaze environment: BASE_URL: "http://bridgehead-ccp-blaze:8080" @@ -72,7 +72,7 @@ services: - "traefik.http.routers.blaze_ccp.tls=true" spot: - image: samply/spot:latest + image: docker.verbis.dkfz.de/cache/samply/spot:latest container_name: bridgehead-spot environment: SECRET: ${SPOT_BEAM_SECRET_LONG} @@ -85,7 +85,7 @@ services: - "blaze" beam-proxy: - image: samply/beam-proxy:develop + image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml index eb8d194..d5bb351 100644 --- a/ccp/exliquid-compose.yml +++ b/ccp/exliquid-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: exliquid-task-store: - image: "samply/blaze:0.19" + image: docker.verbis.dkfz.de/cache/samply/blaze:0.19 container_name: bridgehead-exliquid-task-store environment: BASE_URL: "http://bridgehead-exliquid-task-store:8080" @@ -13,7 +13,7 @@ services: - "traefik.enable=false" exliquid-report-hub: - image: "samply/report-hub:latest" + image: docker.verbis.dkfz.de/cache/samply/report-hub:latest container_name: bridgehead-exliquid-report-hub environment: SPRING_WEBFLUX_BASE_PATH: "/exliquid" diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index cb0c89a..be1375e 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -42,7 +42,7 @@ services: - patientlist-db patientlist-db: - image: postgres:15.1-alpine + image: docker.verbis.dkfz.de/cache/postgres:15.1-alpine container_name: bridgehead-patientlist-db environment: POSTGRES_USER: "mainzelliste" diff --git a/ccp/mtba-compose.yml b/ccp/mtba-compose.yml index bb90059..01cff12 100644 --- a/ccp/mtba-compose.yml +++ b/ccp/mtba-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: mtba: - image: samply/mtba:develop + image: docker.verbis.dkfz.de/cache/samply/mtba:develop container_name: bridgehead-mtba environment: BLAZE_STORE_URL: http://blaze:8080 diff --git a/ccp/nngm-compose.yml b/ccp/nngm-compose.yml index c212fed..bd189fb 100644 --- a/ccp/nngm-compose.yml +++ b/ccp/nngm-compose.yml @@ -18,7 +18,7 @@ services: - "traefik.http.routers.connector.tls=true" connector_db: - image: postgres:9.5-alpine + image: docker.verbis.dkfz.de/cache/postgres:9.5-alpine container_name: bridgehead-ccp-connector-db volumes: - "connector_db_data:/var/lib/postgresql/data" diff --git a/lib/functions.sh b/lib/functions.sh index 836ffcc..fb93e87 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -11,7 +11,7 @@ detectCompose() { getLdmPassword() { if [ -n "$LDM_PASSWORD" ]; then - docker run --rm httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r' + docker run --rm docker.verbis.dkfz.de/cache/httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r' else echo -n "" fi