From ff0176599ed02d6723a9a2d4ec44892da9125bc9 Mon Sep 17 00:00:00 2001 From: mahula Date: Sat, 22 Jun 2024 21:31:37 +0200 Subject: [PATCH 1/2] remove obsolete version element from all docker yaml files --- deployment/docker-compose.ocelotsocial-branded.yml | 3 --- deployment/docker-compose.yml | 2 -- docker-compose.maintenance.yml | 4 +--- docker-compose.override.yml | 2 -- docker-compose.test.yml | 2 -- docker-compose.yml | 2 -- 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/deployment/docker-compose.ocelotsocial-branded.yml b/deployment/docker-compose.ocelotsocial-branded.yml index 0c42d6273..2899168d3 100644 --- a/deployment/docker-compose.ocelotsocial-branded.yml +++ b/deployment/docker-compose.ocelotsocial-branded.yml @@ -1,6 +1,3 @@ -# This docker-compose file is just here for testing -version: "3.4" - services: ######################################################## diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index e66b41f9f..4df6fb031 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -1,5 +1,3 @@ -# This docker-compose file is just here for testing -version: "3.4" services: webapp-base: image: ocelotsocialnetwork/webapp:local-base diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index b006713ec..20c4fe915 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -1,8 +1,6 @@ # Todo: !!! This file seems related to our old maintenance worker for MongoDB and has to be refactored in case of using it !!! -version: "3.4" - -services: +ervices: maintenance-worker: image: ocelotsocialnetwork/develop-maintenance-worker:latest build: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 1d8dbf966..d99ef9cfb 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: ######################################################## diff --git a/docker-compose.test.yml b/docker-compose.test.yml index fa858f28c..9ee94801d 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: ######################################################## diff --git a/docker-compose.yml b/docker-compose.yml index 55fe8b262..ed69e7f01 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,6 @@ # is required to explicitly define if you want an production build: # > docker-compose -f docker-compose.yml up -version: "3.4" - services: ######################################################## From 635c3e3a57b6e21d10dcba62a3e8adbcb40b4136 Mon Sep 17 00:00:00 2001 From: mahula Date: Sat, 22 Jun 2024 21:50:05 +0200 Subject: [PATCH 2/2] fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schäfer --- docker-compose.maintenance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index 20c4fe915..3a56b7960 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -1,6 +1,6 @@ # Todo: !!! This file seems related to our old maintenance worker for MongoDB and has to be refactored in case of using it !!! -ervices: +services: maintenance-worker: image: ocelotsocialnetwork/develop-maintenance-worker:latest build: