Skip to content

Commit

Permalink
Merge pull request #1515 from hyperledger/fix_fabric_build
Browse files Browse the repository at this point in the history
Fix fabric build
  • Loading branch information
EnriqueL8 authored May 23, 2024
2 parents 514d1e8 + 9967218 commit 261ff1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ ADD --chown=1001:0 . .
RUN make build

FROM --platform=$FABRIC_BUILDER_PLATFORM $FABRIC_BUILDER_TAG AS fabric-builder
RUN apk add gcompat=1.1.0-r4
WORKDIR /firefly/smart_contracts/fabric/firefly-go
RUN chgrp -R 0 /firefly \
&& chmod -R g+rwX /firefly \
Expand All @@ -38,9 +37,9 @@ USER 1001
ADD --chown=1001:0 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 curl https://github.com/hyperledger/fabric/releases/download/v2.3.2/hyperledger-fabric-linux-amd64-2.3.2.tar.gz -L --output hyperledger-fabric-linux-amd64-2.3.2.tar.gz
RUN tar -zxf hyperledger-fabric-linux-amd64-2.3.2.tar.gz
RUN touch core.yaml
ENV FABRIC_CFG_PATH /tmp/fabric/config/
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

FROM $SOLIDITY_BUILDER_TAG AS solidity-builder
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"image": "golang:1.21-alpine3.19"
},
"fabric-builder": {
"image": "golang:1.21-alpine3.19",
"image": "golang:1.21",
"platform": "linux/x86_64"
},
"solidity-builder": {
Expand Down

0 comments on commit 261ff1b

Please sign in to comment.