diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index fd951b66..91103b2e 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -1705,7 +1705,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) sleep 4 } @@ -1831,13 +1831,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3215,7 +3215,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) + (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 70593fcf..24a92f05 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -1655,7 +1655,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) sleep 4 } @@ -1786,13 +1786,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3080,7 +3080,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) + (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index 687c5c2f..ae98f511 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -3483,7 +3483,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) sleep 4 } @@ -3717,13 +3717,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5423,7 +5423,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) + (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index a9bcb921..0c017261 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -3821,7 +3821,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) sleep 4 } @@ -3979,13 +3979,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5935,7 +5935,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) + (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh index 7c90248a..8068e00e 100644 --- a/src/setup-docker/templates/fabric-docker/commands-generated.sh +++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh @@ -23,7 +23,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) sleep 4 } @@ -209,13 +209,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) printf "Removing chaincode containers & images... \U1F5D1 \n" <% chaincodes.forEach((chaincode) => { -%> diff --git a/src/setup-docker/templates/fabric-docker/snapshot-scripts.sh b/src/setup-docker/templates/fabric-docker/snapshot-scripts.sh index c7b3f3ac..8ba0c648 100644 --- a/src/setup-docker/templates/fabric-docker/snapshot-scripts.sh +++ b/src/setup-docker/templates/fabric-docker/snapshot-scripts.sh @@ -76,7 +76,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) + (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) for node in $(__getCASQLiteNodes); do echo "Restoring $node..."