From 213ac6370a0dc2513284e12db0e7d1edd6bcebc0 Mon Sep 17 00:00:00 2001 From: juarez Date: Thu, 3 Aug 2023 10:35:41 +0200 Subject: [PATCH] Remove unnecessary version of docker-compose.override files --- bbmri/modules/dnpm-compose.yml | 2 -- ccp/modules/datashield-compose.yml | 2 -- ccp/modules/dnpm-compose.yml | 2 -- ccp/modules/exporter-compose.yml | 2 -- ccp/modules/id-management-compose.yml | 1 - ccp/modules/login-compose.yml | 2 -- ccp/modules/mtba-compose.yml | 2 -- ccp/modules/nngm-compose.yml | 3 --- ccp/modules/teiler-ui-compose.yml | 2 -- 9 files changed, 18 deletions(-) diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml index 099bf0a..e1f91eb 100644 --- a/bbmri/modules/dnpm-compose.yml +++ b/bbmri/modules/dnpm-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: dnpm-beam-proxy: image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index 160e1c2..be7ad8e 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: ############################################ DataSHIELD Client (Rocker R-Studio) rstudio: diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index 5a56e97..ae4c118 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: beam-proxy: environment: diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index 382f20b..0673c17 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: exporter: image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index 11d45cb..9c72d76 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: id-manager: image: docker.verbis.dkfz.de/bridgehead/magicpl diff --git a/ccp/modules/login-compose.yml b/ccp/modules/login-compose.yml index 1f29084..a23584e 100644 --- a/ccp/modules/login-compose.yml +++ b/ccp/modules/login-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: ############################################ Keycloak login-db: diff --git a/ccp/modules/mtba-compose.yml b/ccp/modules/mtba-compose.yml index 60845f5..c94e885 100644 --- a/ccp/modules/mtba-compose.yml +++ b/ccp/modules/mtba-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: mtba: image: docker.verbis.dkfz.de/cache/samply/mtba:1.0.0 diff --git a/ccp/modules/nngm-compose.yml b/ccp/modules/nngm-compose.yml index e61532d..e52e26c 100644 --- a/ccp/modules/nngm-compose.yml +++ b/ccp/modules/nngm-compose.yml @@ -21,9 +21,6 @@ services: - "traefik.http.routers.connector.middlewares=connector_strip,auth-nngm" volumes: - nngm-rest:/var/log - traefik: labels: - "traefik.http.middlewares.auth-nngm.basicauth.users=${NNGM_AUTH}" - - diff --git a/ccp/modules/teiler-ui-compose.yml b/ccp/modules/teiler-ui-compose.yml index 5a51c8e..92a98d8 100644 --- a/ccp/modules/teiler-ui-compose.yml +++ b/ccp/modules/teiler-ui-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: teiler-root-config: