From 5e9b5f725b68a52f4bc166af930463347caa1569 Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <Mark.S.Lewis@outlook.com>
Date: Fri, 14 Nov 2025 16:57:29 +0000
Subject: [PATCH] Remove empty test-network Docker Compose files

Empty Docker Conpose YAML files can cause errors with old Docker Compose
versions due to bugs in their YAML handling. Since these files are empty
and have no functional purpose, this change removes the files and
references to them in scripts.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
---
 test-network/compose/docker/docker-compose-ca.yaml    | 4 ----
 test-network/compose/docker/docker-compose-couch.yaml | 4 ----
 test-network/compose/podman/podman-compose-ca.yaml    | 4 ----
 test-network/compose/podman/podman-compose-couch.yaml | 4 ----
 test-network/network.sh                               | 8 ++++----
 5 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 test-network/compose/docker/docker-compose-ca.yaml
 delete mode 100644 test-network/compose/docker/docker-compose-couch.yaml
 delete mode 100644 test-network/compose/podman/podman-compose-ca.yaml
 delete mode 100644 test-network/compose/podman/podman-compose-couch.yaml

diff --git a/test-network/compose/docker/docker-compose-ca.yaml b/test-network/compose/docker/docker-compose-ca.yaml
deleted file mode 100644
index 19c33dd5..00000000
--- a/test-network/compose/docker/docker-compose-ca.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
diff --git a/test-network/compose/docker/docker-compose-couch.yaml b/test-network/compose/docker/docker-compose-couch.yaml
deleted file mode 100644
index 19c33dd5..00000000
--- a/test-network/compose/docker/docker-compose-couch.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
diff --git a/test-network/compose/podman/podman-compose-ca.yaml b/test-network/compose/podman/podman-compose-ca.yaml
deleted file mode 100644
index 19c33dd5..00000000
--- a/test-network/compose/podman/podman-compose-ca.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
diff --git a/test-network/compose/podman/podman-compose-couch.yaml b/test-network/compose/podman/podman-compose-couch.yaml
deleted file mode 100644
index 19c33dd5..00000000
--- a/test-network/compose/podman/podman-compose-couch.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
diff --git a/test-network/network.sh b/test-network/network.sh
index 9f8b375a..af13ac54 100755
--- a/test-network/network.sh
+++ b/test-network/network.sh
@@ -222,7 +222,7 @@ function createOrgs() {
   # Create crypto material using Fabric CA
   if [ "$CRYPTO" == "Certificate Authorities" ]; then
     infoln "Generating certificates using Fabric CA"
-    ${CONTAINER_CLI_COMPOSE} -f compose/$COMPOSE_FILE_CA -f compose/$CONTAINER_CLI/${CONTAINER_CLI}-$COMPOSE_FILE_CA up -d 2>&1
+    ${CONTAINER_CLI_COMPOSE} -f compose/$COMPOSE_FILE_CA up -d 2>&1
 
     . organizations/fabric-ca/registerEnroll.sh
 
@@ -307,7 +307,7 @@ function networkUp() {
   COMPOSE_FILES="-f compose/${COMPOSE_FILE_BASE} -f compose/${CONTAINER_CLI}/${CONTAINER_CLI}-${COMPOSE_FILE_BASE}"
 
   if [ "${DATABASE}" == "couchdb" ]; then
-    COMPOSE_FILES="${COMPOSE_FILES} -f compose/${COMPOSE_FILE_COUCH} -f compose/${CONTAINER_CLI}/${CONTAINER_CLI}-${COMPOSE_FILE_COUCH}"
+    COMPOSE_FILES="${COMPOSE_FILES} -f compose/${COMPOSE_FILE_COUCH}"
   fi
 
   DOCKER_SOCK="${DOCKER_SOCK}" ${CONTAINER_CLI_COMPOSE} ${COMPOSE_FILES} up -d 2>&1
@@ -435,8 +435,8 @@ function networkDown() {
   local temp_compose=$COMPOSE_FILE_BASE
   COMPOSE_FILE_BASE=compose-bft-test-net.yaml
   COMPOSE_BASE_FILES="-f compose/${COMPOSE_FILE_BASE} -f compose/${CONTAINER_CLI}/${CONTAINER_CLI}-${COMPOSE_FILE_BASE}"
-  COMPOSE_COUCH_FILES="-f compose/${COMPOSE_FILE_COUCH} -f compose/${CONTAINER_CLI}/${CONTAINER_CLI}-${COMPOSE_FILE_COUCH}"
-  COMPOSE_CA_FILES="-f compose/${COMPOSE_FILE_CA} -f compose/${CONTAINER_CLI}/${CONTAINER_CLI}-${COMPOSE_FILE_CA}"
+  COMPOSE_COUCH_FILES="-f compose/${COMPOSE_FILE_COUCH}"
+  COMPOSE_CA_FILES="-f compose/${COMPOSE_FILE_CA}"
   COMPOSE_FILES="${COMPOSE_BASE_FILES} ${COMPOSE_COUCH_FILES} ${COMPOSE_CA_FILES}"
 
   # stop org3 containers also in addition to org1 and org2, in case we were running sample to add org3