Merge pull request #363 from fisuda/hardening/docker-compose-yml

Remove version property from docker compose files
lets-fiware · May 26, 2024 · 9fe055c · 9fe055c
2 parents 86bb19b + d0653e8
commit 9fe055c
Show file tree

Hide file tree

Showing 32 changed files with 4 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## FIWARE Big Bang v0.37.0-next
 
+-   Remove version property from docker compose files (#363)
 -   Update Orion to 3.12.0 (#362)
 -   Update Orion to 3.11.0 (#361)
 -   Fixes spelling of "template" folder (#360)

diff --git a/extras/node-red/docker-compose.yml b/extras/node-red/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   node-red:
     build: .

diff --git a/lets-fiware.sh b/lets-fiware.sh
@@ -1374,7 +1374,7 @@ add_docker_compose_yml() {
   logging_info "${FUNCNAME[0]} $1"
 
   echo "" >> ${DOCKER_COMPOSE_YML}
-  sed -e '/^version:/,/services:/d' "${TEMPLATE}"/docker/"$1" >> ${DOCKER_COMPOSE_YML}
+  sed -e '/services:/d' "${TEMPLATE}"/docker/"$1" >> ${DOCKER_COMPOSE_YML}
 }
 
 #
@@ -1721,7 +1721,7 @@ setup_wilma_basic_authorization() {
 
   # add docker-compose.yml 
   echo "" >> ${DOCKER_COMPOSE_YML}
-  sed -e '/^version:/,/services:/d' "${WORK_DIR}"/docker-wilma.yml >> ${DOCKER_COMPOSE_YML}
+  sed -e '/services:/d' "${WORK_DIR}"/docker-wilma.yml >> ${DOCKER_COMPOSE_YML}
 
   rm -f "${WORK_DIR}"/docker-wilma.yml
 
@@ -3161,7 +3161,7 @@ EOF
     sed "s/${env_val}/NODE_RED_/" | \
     sed "/__NODE_RED_ENVIRONMENT__/i \      - NODE_RED_HTTP_NODE_ROOT=${http_node_root}" | \
     sed "/__NODE_RED_ENVIRONMENT__/i \      - NODE_RED_HTTP_ADMIN_ROOT=${http_admin_root}" | \
-    sed "/^version:/,/services:/d" >> ${DOCKER_COMPOSE_YML}
+    sed "/services:/d" >> ${DOCKER_COMPOSE_YML}
 
     sed -i -e "s/proxy_pass http:\/\/node-red:1880/return 404/" "${node_red_nginx}"
     sed -i -e "/__NODE_RED_SERVER__/i \  location ${http_admin_root} {\n    proxy_pass http:\/\/${username}:1880${http_admin_root};\n  }\n" "${node_red_nginx}"

diff --git a/setup/template/docker/docker-comet.yml b/setup/template/docker/docker-comet.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   comet:
     image: ${IMAGE_COMET}

diff --git a/setup/template/docker/docker-cygnus.yml b/setup/template/docker/docker-cygnus.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   cygnus:
     image: ${IMAGE_CYGNUS}

diff --git a/setup/template/docker/docker-draco.yml b/setup/template/docker/docker-draco.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   draco:
     image: ${IMAGE_DRACO}

diff --git a/setup/template/docker/docker-elasticsearch.yml b/setup/template/docker/docker-elasticsearch.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   elasticsearch-db:
     image: ${IMAGE_ELASTICSEARCH_DB}

diff --git a/setup/template/docker/docker-grafana.yml b/setup/template/docker/docker-grafana.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   grafana:
     image: ${IMAGE_GRAFANA}

diff --git a/setup/template/docker/docker-iotagent-json.yml b/setup/template/docker/docker-iotagent-json.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   iotagent-json:
     image: ${IMAGE_IOTAGENT_JSON}

diff --git a/setup/template/docker/docker-iotagent-ul.yml b/setup/template/docker/docker-iotagent-ul.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   iotagent-ul:
     image: ${IMAGE_IOTAGENT_UL}

diff --git a/setup/template/docker/docker-keyrock.yml b/setup/template/docker/docker-keyrock.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   keyrock:
     image: ${IMAGE_KEYROCK}

diff --git a/setup/template/docker/docker-mintaka.yml b/setup/template/docker/docker-mintaka.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   mintaka:
     image: ${IMAGE_MINTAKA}

diff --git a/setup/template/docker/docker-mongo.yml b/setup/template/docker/docker-mongo.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   mongo:
     image: ${IMAGE_MONGO}

diff --git a/setup/template/docker/docker-mosquitto.yml b/setup/template/docker/docker-mosquitto.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   mosquitto:
     image: ${IMAGE_MOSQUITTO}

diff --git a/setup/template/docker/docker-mysql.yml b/setup/template/docker/docker-mysql.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   mysql:
     image: ${IMAGE_MYSQL}

diff --git a/setup/template/docker/docker-nginx.yml b/setup/template/docker/docker-nginx.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   nginx:
     image: ${IMAGE_NGINX}

diff --git a/setup/template/docker/docker-node-red.yml b/setup/template/docker/docker-node-red.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   node-red:
     image: ${IMAGE_NODE_RED}

diff --git a/setup/template/docker/docker-orion-ld.yml b/setup/template/docker/docker-orion-ld.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   orion-ld:
     image: ${IMAGE_ORION_LD}

diff --git a/setup/template/docker/docker-orion.yml b/setup/template/docker/docker-orion.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   orion:
     image: ${IMAGE_ORION}

diff --git a/setup/template/docker/docker-perseo.yml b/setup/template/docker/docker-perseo.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   perseo-core:
     image: ${IMAGE_PERSEO_CORE}

diff --git a/setup/template/docker/docker-postfix.yml b/setup/template/docker/docker-postfix.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   postfix:
     image: ${IMAGE_POSTFIX}

diff --git a/setup/template/docker/docker-postgres.yml b/setup/template/docker/docker-postgres.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   postgres:
     image: ${IMAGE_POSTGRES}

diff --git a/setup/template/docker/docker-quantumleap.yml b/setup/template/docker/docker-quantumleap.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   quantumleap:
     image: ${IMAGE_QUANTUMLEAP}

diff --git a/setup/template/docker/docker-queryproxy.yml b/setup/template/docker/docker-queryproxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   queryproxy:
     image: ${IMAGE_QUERYPROXY}

diff --git a/setup/template/docker/docker-regproxy.yml b/setup/template/docker/docker-regproxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   regproxy:
     image: ${IMAGE_REGPROXY}

diff --git a/setup/template/docker/docker-tokenproxy.yml b/setup/template/docker/docker-tokenproxy.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   tokenproxy:
     image: ${IMAGE_TOKENPROXY}

diff --git a/setup/template/docker/docker-wilma.yml b/setup/template/docker/docker-wilma.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   wilma:
     image: ${IMAGE_WILMA}

diff --git a/setup/template/docker/docker-wirecloud.yml b/setup/template/docker/docker-wirecloud.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   wirecloud:
     image: ${IMAGE_WIRECLOUD}

diff --git a/setup/template/docker/docker-zeppelin.yml b/setup/template/docker/docker-zeppelin.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   zeppelin:
     image: ${IMAGE_ZEPPELIN}

diff --git a/setup/template/docker/setup-cert.yml b/setup/template/docker/setup-cert.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   nginx:
     image: ${IMAGE_NGINX}

diff --git a/setup/template/docker/setup-keyrock-mysql.yml b/setup/template/docker/setup-keyrock-mysql.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   keyrock:
     image: ${IMAGE_KEYROCK}

diff --git a/tests/keyrock/keyrock-compose.yml b/tests/keyrock/keyrock-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   keyrock:
     image: fiware/idm:8.1.0