Skip to content

Commit

Permalink
Merge pull request #141 from kaleido-io/fixing-docker-build
Browse files Browse the repository at this point in the history
Fixing failing Docker builds
  • Loading branch information
nguyer committed Apr 5, 2024
2 parents 2976b65 + e20bae3 commit 1657bb8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,5 +1,5 @@
FROM node:20-alpine3.17 as solidity-build
RUN apk add python3=3.10.13-r0 alpine-sdk=1.0-r1
FROM node:20-alpine3.19 as solidity-build
RUN apk add python3=3.11.8-r0 alpine-sdk=1.0-r1
USER node
WORKDIR /home/node
ADD --chown=node:node ./samples/solidity/package*.json ./
Expand All @@ -22,7 +22,7 @@ RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/
RUN trivy fs --format spdx-json --output /sbom.spdx.json /SBOM
RUN trivy sbom /sbom.spdx.json --severity UNKNOWN,HIGH,CRITICAL --exit-code 1

FROM node:20-alpine3.17
FROM node:20-alpine3.19
RUN apk add curl=8.5.0-r0
# We also need to keep copying it to the old location to maintain compatibility with the FireFly CLI
COPY --from=solidity-build --chown=1001:0 /home/node/artifacts/contracts/ERC1155MixedFungible.sol/ERC1155MixedFungible.json /root/contracts/
Expand Down

0 comments on commit 1657bb8

Please sign in to comment.