Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(examples): update versions in discounted-asset-trade example #3360

Merged
merged 1 commit into from
Jun 26, 2024
Merged

chore(examples): update versions in discounted-asset-trade example #3360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/cactus-example-discounted-asset-trade/script-start-ledgers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ CONFIG_VOLUME_PATH="./etc/cactus" # Docker volume with shared configuration

# Fabric Env Variables
export CACTUS_FABRIC_ALL_IN_ONE_CONTAINER_NAME="asset_trade_faio2x_testnet"
export CACTUS_FABRIC_ALL_IN_ONE_VERSION="2.4.4"
export CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION="2.4.2"
export CACTUS_FABRIC_ALL_IN_ONE_VERSION="2.5.6"
export CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION="2.5.4"
export CACTUS_FABRIC_ALL_IN_ONE_CA_VERSION="1.5.3"
export CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION_FABRIC="0.4"
export CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION="3.2.2"
Expand Down Expand Up @@ -172,4 +172,4 @@ function start_ledgers() {
}

start_ledgers
echo "All Done."
echo "All Done."
6 changes: 3 additions & 3 deletions tools/docker/fabric-all-in-one/Dockerfile_v2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ RUN apk add --no-cache npm nodejs
RUN apk add --no-cache yq

# Download and setup path variables for Go
RUN wget https://golang.org/dl/go1.20.6.linux-amd64.tar.gz
RUN tar -xvf go1.20.6.linux-amd64.tar.gz
RUN wget https://golang.org/dl/go1.22.4.linux-amd64.tar.gz
RUN tar -xvf go1.22.4.linux-amd64.tar.gz
RUN mv go /usr/local
ENV GOROOT=/usr/local/go
ENV GOPATH=/usr/local/go
ENV PATH=$PATH:$GOPATH/bin
RUN rm go1.20.6.linux-amd64.tar.gz
RUN rm go1.22.4.linux-amd64.tar.gz
rajat-dlt marked this conversation as resolved.
Show resolved Hide resolved

# Needed as of as of go v1.20
# @see https://github.com/golang/go/issues/59305#issuecomment-1488478737
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/fabric-all-in-one/docker-compose-v2.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ services:
- "8054:8054" # ca_org2
- "9054:9054" # ca_orderer
environment:
- FABRIC_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_VERSION:-2.4.4}
- FABRIC_NODEENV_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION:-2.4.2}
- FABRIC_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_VERSION:-2.5.6}
- FABRIC_NODEENV_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION:-2.5.4}
- CA_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_CA_VERSION:-1.5.3}
- COUCH_VERSION_FABRIC=${CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION_FABRIC:-0.4}
- COUCH_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION:-3.2.2}
Expand Down
Loading