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

feature: changes to support upgrade to Fabric v2.5 TLS in Firefly CLI #1415

Closed
wants to merge 3 commits into from
Closed

feature: changes to support upgrade to Fabric v2.5 TLS in Firefly CLI #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
505dc2d
feature: added support to Fabric v2.5 TLS, updated GO to version 1.20…
Oct 4, 2023
2bdec12
Merge branch 'hyperledger:main' into main
torrespro Oct 11, 2023
d765789
fix: duplicated GO111MODULE removed
Oct 26, 2023
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
17 changes: 14 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,24 @@ ADD . .
RUN make build

FROM --platform=$FABRIC_BUILDER_PLATFORM $FABRIC_BUILDER_TAG AS fabric-builder
RUN apk add libc6-compat
RUN apt-get update && \
apt-get install -y --no-install-recommends \
wget \
sudo \
curl \
ca-certificates && \
rm -rf /var/lib/apt/lists/*
# Install Go
ARG GO_VERSION=1.20
ARG ARCH=amd64
RUN curl -fsSL "https://golang.org/dl/go$GO_VERSION.linux-$ARCH.tar.gz" | tar -C /usr/local -xzf -
ENV PATH="/usr/local/go/bin:$PATH"
WORKDIR /firefly/smart_contracts/fabric/firefly-go
ADD smart_contracts/fabric/firefly-go .
RUN GO111MODULE=on go mod vendor
WORKDIR /tmp/fabric
RUN wget https://github.com/hyperledger/fabric/releases/download/v2.3.2/hyperledger-fabric-linux-amd64-2.3.2.tar.gz
RUN tar -zxf hyperledger-fabric-linux-amd64-2.3.2.tar.gz
RUN wget https://github.com/hyperledger/fabric/releases/download/v2.5.4/hyperledger-fabric-linux-amd64-2.5.4.tar.gz
RUN tar -zxf hyperledger-fabric-linux-amd64-2.5.4.tar.gz
RUN touch core.yaml
RUN ./bin/peer lifecycle chaincode package /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz --path /firefly/smart_contracts/fabric/firefly-go --lang golang --label firefly_1.0

Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"image": "golang:1.19-alpine3.16"
},
"fabric-builder": {
"image": "golang:1.19-alpine3.16",
"image": "ubuntu:22.04",
"platform": "linux/x86_64"
},
"solidity-builder": {
Expand Down