Skip to content

Commit

Permalink
Merge pull request #465 from Sanket-0510/update_docker_compose
Browse files Browse the repository at this point in the history 
updated the docker compose command
  • Loading branch information
@dzikowski
dzikowski authored Aug 7, 2024
2 parents 63701a3 + e32ba84 commit 4005bb4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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..."
Expand Down
8 changes: 4 additions & 4 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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..."
Expand Down
8 changes: 4 additions & 4 deletions e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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..."
Expand Down
8 changes: 4 additions & 4 deletions e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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..."
Expand Down
6 changes: 3 additions & 3 deletions src/setup-docker/templates/fabric-docker/commands-generated.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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) => { -%>
Expand Down
2 changes: 1 addition & 1 deletion src/setup-docker/templates/fabric-docker/snapshot-scripts.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down

0 comments on commit 4005bb4

Please sign in to comment.