diff --git a/CHANGELOG.md b/CHANGELOG.md index b3cc8ea9..0bd01aa1 100644 --- 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 index 663072b6..6affe600 100644 --- 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 index b9af546c..02460157 100755 --- 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 index fe743a5f..0e344640 100644 --- 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 index cee2b2e7..758f4574 100644 --- 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 index 3b1b16b2..d1deda7d 100644 --- 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 index d1e1cf92..0ee8ed2a 100644 --- 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 index 58bd6195..7106bf26 100644 --- 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 index a3e9d646..5f69d858 100644 --- 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 index d0a55771..df302db1 100644 --- 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 index dba7c47f..8e8fd3ef 100644 --- 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 index 7a50153b..93ef41da 100644 --- 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 index d08f7607..42b1bcac 100644 --- 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 index 38836bd6..fd363fb4 100644 --- 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 index a13571f3..570fef5b 100644 --- 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 index 83d67e7f..970bbdd4 100644 --- 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 index 3089fd8b..a08ac256 100644 --- 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 index 78f25d27..c01295a6 100644 --- 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 index 365a0a7c..180e8683 100644 --- 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 index e668d751..d6b9cf32 100644 --- 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 index ba1f550c..53a4a90c 100644 --- 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 index 5342dc9f..3f33dc85 100644 --- 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 index 86dd26af..0d596e72 100644 --- 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 index 07dc65ba..b276706e 100644 --- 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 index 5b6b43ba..cf969591 100644 --- 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 index 4e0dbb78..cccb2ab2 100644 --- 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 index 73202692..b1117cad 100644 --- 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 index 9d6c669b..244f6a3b 100644 --- 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 index 2a162660..8b38beb3 100644 --- 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 index eae54223..d2c7096b 100644 --- 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 index d33daf93..c8551ebd 100644 --- 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 index 47a22641..986752fd 100644 --- 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