From a72b2b5132c3909a9cc940cd8407b602462129e8 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Tue, 4 Nov 2025 15:52:28 +0000 Subject: [PATCH] Remove obsolete version element from compose files (#1361) The version element is obsolete and unused since Compose v1 was deprecated in favour of Compose v2 in 2022, and reached end-of-life in 2023. The version element generates warning messages running Docker Compose commands when bringing up and down the test-network, which adds unnecessary noise and can be confusing for users. Signed-off-by: Mark S. Lewis --- .../docker-compose-chaincode.yaml | 2 -- .../rest-api-typescript/docker-compose.yaml | 21 ++++++++-------- .../addOrg3/compose/compose-ca-org3.yaml | 2 -- .../addOrg3/compose/compose-couch-org3.yaml | 2 -- .../addOrg3/compose/compose-org3.yaml | 2 -- .../docker/docker-compose-ca-org3.yaml | 3 --- .../docker/docker-compose-couch-org3.yaml | 3 --- .../compose/docker/docker-compose-org3.yaml | 3 --- .../podman/podman-compose-ca-org3.yaml | 2 -- .../podman/podman-compose-couch-org3.yaml | 2 -- .../compose/podman/podman-compose-org3.yaml | 2 -- .../compose/compose-bft-test-net.yaml | 2 -- test-network/compose/compose-ca.yaml | 2 -- test-network/compose/compose-couch.yaml | 2 -- test-network/compose/compose-test-net.yaml | 2 -- .../docker/docker-compose-bft-test-net.yaml | 1 - .../compose/docker/docker-compose-ca.yaml | 3 --- .../compose/docker/docker-compose-couch.yaml | 2 -- .../docker/docker-compose-test-net.yaml | 1 - .../compose/podman/podman-compose-ca.yaml | 2 -- .../compose/podman/podman-compose-couch.yaml | 2 -- .../podman/podman-compose-test-net.yaml | 2 -- .../prometheus-grafana/docker-compose.yaml | 24 +++++++++---------- token-sdk/compose-ca.yaml | 2 -- token-sdk/docker-compose.yaml | 18 +++++++------- token-sdk/explorer/docker-compose.yaml | 4 ---- 26 files changed, 29 insertions(+), 84 deletions(-) diff --git a/asset-transfer-basic/chaincode-external/docker-compose-chaincode.yaml b/asset-transfer-basic/chaincode-external/docker-compose-chaincode.yaml index f7aa6f29..61e5f946 100644 --- a/asset-transfer-basic/chaincode-external/docker-compose-chaincode.yaml +++ b/asset-transfer-basic/chaincode-external/docker-compose-chaincode.yaml @@ -1,5 +1,3 @@ -version: "3.6" - networks: docker_test: external: true diff --git a/asset-transfer-basic/rest-api-typescript/docker-compose.yaml b/asset-transfer-basic/rest-api-typescript/docker-compose.yaml index 3060b591..aaf88215 100644 --- a/asset-transfer-basic/rest-api-typescript/docker-compose.yaml +++ b/asset-transfer-basic/rest-api-typescript/docker-compose.yaml @@ -1,17 +1,17 @@ -version: '3' -# Replace network name with the fabric test-network name +# Replace network name with the fabric test-network name services: - redis: - image: 'redis' - command: ['--maxmemory-policy','noeviction','--requirepass','${REDIS_PASSWORD}'] + redis: + image: "redis" + command: + ["--maxmemory-policy", "noeviction", "--requirepass", "${REDIS_PASSWORD}"] ports: - 6379:6379 networks: - fabric_test - + nodeapp: - image: 'ghcr.io/hyperledger/fabric-rest-sample:latest' - command: ['start:dotenv'] + image: "ghcr.io/hyperledger/fabric-rest-sample:latest" + command: ["start:dotenv"] ports: - 3000:3000 env_file: @@ -19,9 +19,8 @@ services: environment: - REDIS_PASSWORD networks: - - fabric_test - + - fabric_test networks: fabric_test: - external: true + external: true diff --git a/test-network/addOrg3/compose/compose-ca-org3.yaml b/test-network/addOrg3/compose/compose-ca-org3.yaml index 74dbf4d6..1096d442 100644 --- a/test-network/addOrg3/compose/compose-ca-org3.yaml +++ b/test-network/addOrg3/compose/compose-ca-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/addOrg3/compose/compose-couch-org3.yaml b/test-network/addOrg3/compose/compose-couch-org3.yaml index c7f36c11..345a20b2 100644 --- a/test-network/addOrg3/compose/compose-couch-org3.yaml +++ b/test-network/addOrg3/compose/compose-couch-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/addOrg3/compose/compose-org3.yaml b/test-network/addOrg3/compose/compose-org3.yaml index f6e1ca1b..556690d3 100644 --- a/test-network/addOrg3/compose/compose-org3.yaml +++ b/test-network/addOrg3/compose/compose-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - volumes: peer0.org3.example.com: diff --git a/test-network/addOrg3/compose/docker/docker-compose-ca-org3.yaml b/test-network/addOrg3/compose/docker/docker-compose-ca-org3.yaml index 16732f0c..19c33dd5 100644 --- a/test-network/addOrg3/compose/docker/docker-compose-ca-org3.yaml +++ b/test-network/addOrg3/compose/docker/docker-compose-ca-org3.yaml @@ -2,6 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' - diff --git a/test-network/addOrg3/compose/docker/docker-compose-couch-org3.yaml b/test-network/addOrg3/compose/docker/docker-compose-couch-org3.yaml index 16732f0c..19c33dd5 100644 --- a/test-network/addOrg3/compose/docker/docker-compose-couch-org3.yaml +++ b/test-network/addOrg3/compose/docker/docker-compose-couch-org3.yaml @@ -2,6 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' - diff --git a/test-network/addOrg3/compose/docker/docker-compose-org3.yaml b/test-network/addOrg3/compose/docker/docker-compose-org3.yaml index 12c9ea71..c5d67f4e 100644 --- a/test-network/addOrg3/compose/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/compose/docker/docker-compose-org3.yaml @@ -3,14 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test services: - peer0.org3.example.com: container_name: peer0.org3.example.com image: hyperledger/fabric-peer:latest diff --git a/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml b/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml index 74dbf4d6..1096d442 100644 --- a/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml +++ b/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/addOrg3/compose/podman/podman-compose-couch-org3.yaml b/test-network/addOrg3/compose/podman/podman-compose-couch-org3.yaml index c7f36c11..345a20b2 100644 --- a/test-network/addOrg3/compose/podman/podman-compose-couch-org3.yaml +++ b/test-network/addOrg3/compose/podman/podman-compose-couch-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/addOrg3/compose/podman/podman-compose-org3.yaml b/test-network/addOrg3/compose/podman/podman-compose-org3.yaml index 208f6d04..a4a3e665 100644 --- a/test-network/addOrg3/compose/podman/podman-compose-org3.yaml +++ b/test-network/addOrg3/compose/podman/podman-compose-org3.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - volumes: peer0.org3.example.com: diff --git a/test-network/compose/compose-bft-test-net.yaml b/test-network/compose/compose-bft-test-net.yaml index 4ab83059..26c96b80 100644 --- a/test-network/compose/compose-bft-test-net.yaml +++ b/test-network/compose/compose-bft-test-net.yaml @@ -1,5 +1,3 @@ -version: '3.7' - volumes: orderer.example.com: orderer2.example.com: diff --git a/test-network/compose/compose-ca.yaml b/test-network/compose/compose-ca.yaml index f678755b..f0acd2c2 100644 --- a/test-network/compose/compose-ca.yaml +++ b/test-network/compose/compose-ca.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/compose/compose-couch.yaml b/test-network/compose/compose-couch.yaml index 3cbce5ce..247001c8 100644 --- a/test-network/compose/compose-couch.yaml +++ b/test-network/compose/compose-couch.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - networks: test: name: fabric_test diff --git a/test-network/compose/compose-test-net.yaml b/test-network/compose/compose-test-net.yaml index dcac21b0..da0cf51a 100644 --- a/test-network/compose/compose-test-net.yaml +++ b/test-network/compose/compose-test-net.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - volumes: orderer.example.com: peer0.org1.example.com: diff --git a/test-network/compose/docker/docker-compose-bft-test-net.yaml b/test-network/compose/docker/docker-compose-bft-test-net.yaml index 421d8e0b..c23d8ec9 100644 --- a/test-network/compose/docker/docker-compose-bft-test-net.yaml +++ b/test-network/compose/docker/docker-compose-bft-test-net.yaml @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' services: peer0.org1.example.com: container_name: peer0.org1.example.com diff --git a/test-network/compose/docker/docker-compose-ca.yaml b/test-network/compose/docker/docker-compose-ca.yaml index 16732f0c..19c33dd5 100644 --- a/test-network/compose/docker/docker-compose-ca.yaml +++ b/test-network/compose/docker/docker-compose-ca.yaml @@ -2,6 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' - diff --git a/test-network/compose/docker/docker-compose-couch.yaml b/test-network/compose/docker/docker-compose-couch.yaml index 6ab883d4..19c33dd5 100644 --- a/test-network/compose/docker/docker-compose-couch.yaml +++ b/test-network/compose/docker/docker-compose-couch.yaml @@ -2,5 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' diff --git a/test-network/compose/docker/docker-compose-test-net.yaml b/test-network/compose/docker/docker-compose-test-net.yaml index 421d8e0b..c23d8ec9 100644 --- a/test-network/compose/docker/docker-compose-test-net.yaml +++ b/test-network/compose/docker/docker-compose-test-net.yaml @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' services: peer0.org1.example.com: container_name: peer0.org1.example.com diff --git a/test-network/compose/podman/podman-compose-ca.yaml b/test-network/compose/podman/podman-compose-ca.yaml index 6ab883d4..19c33dd5 100644 --- a/test-network/compose/podman/podman-compose-ca.yaml +++ b/test-network/compose/podman/podman-compose-ca.yaml @@ -2,5 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' diff --git a/test-network/compose/podman/podman-compose-couch.yaml b/test-network/compose/podman/podman-compose-couch.yaml index 6ab883d4..19c33dd5 100644 --- a/test-network/compose/podman/podman-compose-couch.yaml +++ b/test-network/compose/podman/podman-compose-couch.yaml @@ -2,5 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -version: '3.7' diff --git a/test-network/compose/podman/podman-compose-test-net.yaml b/test-network/compose/podman/podman-compose-test-net.yaml index f89d6e89..d454c254 100644 --- a/test-network/compose/podman/podman-compose-test-net.yaml +++ b/test-network/compose/podman/podman-compose-test-net.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - services: peer0.org1.example.com: volumes: diff --git a/test-network/prometheus-grafana/docker-compose.yaml b/test-network/prometheus-grafana/docker-compose.yaml index b166f6ea..d2d49d96 100644 --- a/test-network/prometheus-grafana/docker-compose.yaml +++ b/test-network/prometheus-grafana/docker-compose.yaml @@ -1,8 +1,6 @@ -version: '3' - volumes: - prometheus_data: {} - grafana_storage: {} + prometheus_data: {} + grafana_storage: {} services: prometheus: @@ -12,13 +10,13 @@ services: - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml - prometheus_data:/prometheus command: - - '--config.file=/etc/prometheus/prometheus.yml' - - '--storage.tsdb.path=/prometheus' - - '--web.console.libraries=/usr/share/prometheus/console_libraries' - - '--web.console.templates=/usr/share/prometheus/consoles' + - "--config.file=/etc/prometheus/prometheus.yml" + - "--storage.tsdb.path=/prometheus" + - "--web.console.libraries=/usr/share/prometheus/console_libraries" + - "--web.console.templates=/usr/share/prometheus/consoles" ports: - "9090:9090" - + grafana: image: grafana/grafana:8.3.4 container_name: grafana @@ -54,8 +52,8 @@ services: - /proc:/host/proc:ro - /sys:/host/sys:ro command: - - '--path.procfs=/host/proc' - - '--path.sysfs=/host/sys' + - "--path.procfs=/host/proc" + - "--path.sysfs=/host/sys" - --collector.filesystem.ignored-mount-points - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)" ports: @@ -64,5 +62,5 @@ services: networks: default: - external: true - name: fabric_test + external: true + name: fabric_test diff --git a/token-sdk/compose-ca.yaml b/token-sdk/compose-ca.yaml index 89063e91..4395f8b5 100644 --- a/token-sdk/compose-ca.yaml +++ b/token-sdk/compose-ca.yaml @@ -3,8 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '3.7' - services: ca_token_network: image: hyperledger/fabric-ca:1.5.7 diff --git a/token-sdk/docker-compose.yaml b/token-sdk/docker-compose.yaml index e1497667..d06339f8 100644 --- a/token-sdk/docker-compose.yaml +++ b/token-sdk/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.7' - # fabric_test is the name of the fabric-samples test network. # By connecting to it, we can reach the peers at their DNS names # (e.g. peer0.org1.example.com). @@ -44,7 +42,7 @@ services: ports: - 9100:9000 expose: - - 9101 + - 9101 networks: - test depends_on: @@ -92,10 +90,10 @@ services: condition: service_healthy swagger-ui: - image: swaggerapi/swagger-ui - ports: - - '8080:8080' - environment: - - URL=/swagger.yaml - volumes: - - ./swagger.yaml:/usr/share/nginx/html/swagger.yaml + image: swaggerapi/swagger-ui + ports: + - "8080:8080" + environment: + - URL=/swagger.yaml + volumes: + - ./swagger.yaml:/usr/share/nginx/html/swagger.yaml diff --git a/token-sdk/explorer/docker-compose.yaml b/token-sdk/explorer/docker-compose.yaml index 1254cdba..981e2f05 100644 --- a/token-sdk/explorer/docker-compose.yaml +++ b/token-sdk/explorer/docker-compose.yaml @@ -1,10 +1,7 @@ - # SPDX-License-Identifier: Apache-2.0 # see https://github.com/hyperledger-labs/blockchain-explorer -version: '2.1' - volumes: pgdata: walletstore: @@ -15,7 +12,6 @@ networks: external: true services: - explorerdb.mynetwork.com: image: ghcr.io/hyperledger-labs/explorer-db:latest container_name: explorerdb.mynetwork.com