Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ 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

FROM $SOLIDITY_BUILDER_TAG AS solidity-builder
RUN apk add python3 make gcc g++ musl-dev
WORKDIR /firefly/solidity_firefly
ADD smart_contracts/ethereum/solidity_firefly/package*.json .
RUN npm install
RUN npm config set user 0
ADD smart_contracts/ethereum/solidity_firefly .
RUN npx truffle compile
ADD smart_contracts/ethereum/solidity_firefly/ .
RUN apk add jq \
&& mkdir -p build/contracts \
&& cd contracts \
&& solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
&& cd ../build/contracts \
&& jq '{"contractName":"FireFly", "abi":.contracts."Firefly.sol:Firefly".abi, "bytecode":("0x" + .contracts."Firefly.sol:Firefly".bin) }' combined.json > Firefly.json

FROM $BASE_TAG
WORKDIR /firefly
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"platform": "linux/x86_64"
},
"solidity-builder": {
"image": "node:14-alpine3.15"
"image": "ethereum/solc:0.8.11-alpine"
},
"base": {
"image": "alpine:3.15"
Expand Down