@@ -15,16 +15,16 @@ FROM $FIREFLY_BUILDER_TAG AS firefly-builder
1515ARG BUILD_VERSION
1616ARG GIT_REF
1717RUN apk add make=4.4.1-r2 \
18- gcc=13.2.1_git20231014-r0 \
19- build-base=0.5-r3 \
20- curl=8.11 .1-r0 \
21- git=2.43.6-r0
18+ gcc=13.2.1_git20231014-r0 \
19+ build-base=0.5-r3 \
20+ curl=8.12 .1-r0 \
21+ git=2.43.6-r0
2222WORKDIR /firefly
2323RUN chgrp -R 0 /firefly \
24- && chmod -R g+rwX /firefly \
25- && mkdir /.cache \
26- && chgrp -R 0 /.cache \
27- && chmod -R g+rwX /.cache
24+ && chmod -R g+rwX /firefly \
25+ && mkdir /.cache \
26+ && chgrp -R 0 /.cache \
27+ && chmod -R g+rwX /.cache
2828USER 1001
2929ADD --chown=1001:0 go.mod go.sum ./
3030RUN go mod download
@@ -35,10 +35,10 @@ RUN make build
3535FROM --platform=$FABRIC_BUILDER_PLATFORM $FABRIC_BUILDER_TAG AS fabric-builder
3636WORKDIR /firefly/smart_contracts/fabric/firefly-go
3737RUN chgrp -R 0 /firefly \
38- && chmod -R g+rwX /firefly \
39- && mkdir /.cache \
40- && chgrp -R 0 /.cache \
41- && chmod -R g+rwX /.cache
38+ && chmod -R g+rwX /firefly \
39+ && mkdir /.cache \
40+ && chgrp -R 0 /.cache \
41+ && chmod -R g+rwX /.cache
4242USER 1001
4343ADD --chown=1001:0 smart_contracts/fabric/firefly-go .
4444RUN GO111MODULE=on go mod vendor
@@ -55,10 +55,10 @@ RUN chgrp -R 0 /firefly && chmod -R g+rwX /firefly
5555ADD --chown=1001:0 smart_contracts/ethereum/solidity_firefly/ .
5656USER 1001
5757RUN mkdir -p build/contracts \
58- && cd contracts \
59- && solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60- && cd ../build/contracts \
61- && mv combined.json Firefly.json
58+ && cd contracts \
59+ && solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60+ && cd ../build/contracts \
61+ && mv combined.json Firefly.json
6262
6363# SBOM
6464FROM alpine:3.19 AS sbom
@@ -74,26 +74,26 @@ FROM $BASE_TAG
7474ARG UI_TAG
7575ARG UI_RELEASE
7676RUN apk add --update --no-cache \
77- sqlite=3.44.2-r0 \
78- postgresql16-client=16.6 -r0 \
79- curl=8.11 .1-r0 \
80- jq=1.7.1-r0
77+ sqlite=3.44.2-r0 \
78+ postgresql16-client=16.8 -r0 \
79+ curl=8.12 .1-r0 \
80+ jq=1.7.1-r0
8181WORKDIR /firefly
8282RUN chgrp -R 0 /firefly \
83- && chmod -R g+rwX /firefly \
84- && mkdir /etc/firefly \
85- && chgrp -R 0 /etc/firefly \
86- && chmod -R g+rwX /etc/firefly
83+ && chmod -R g+rwX /firefly \
84+ && mkdir /etc/firefly \
85+ && chgrp -R 0 /etc/firefly \
86+ && chmod -R g+rwX /etc/firefly
8787RUN curl -sL "https://github.com/golang-migrate/migrate/releases/download/$(curl -sL https://api.github.com/repos/golang-migrate/migrate/releases/latest | jq -r '.name')/migrate.linux-amd64.tar.gz" | tar xz \
88- && chmod +x ./migrate \
89- && mv ./migrate /usr/bin/migrate
88+ && chmod +x ./migrate \
89+ && mv ./migrate /usr/bin/migrate
9090COPY --from=firefly-builder --chown=1001:0 /firefly/firefly ./firefly
9191COPY --from=firefly-builder --chown=1001:0 /firefly/db ./db
9292COPY --from=solidity-builder --chown=1001:0 /firefly/solidity_firefly/build/contracts ./contracts
9393COPY --from=fabric-builder --chown=1001:0 /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz ./contracts/firefly_fabric.tar.gz
9494ENV UI_RELEASE=https://github.com/hyperledger/firefly-ui/releases/download/$UI_TAG/$UI_RELEASE.tgz
9595RUN mkdir /firefly/frontend \
96- && curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
96+ && curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
9797COPY --from=sbom /sbom.spdx.json /sbom.spdx.json
9898RUN ln -s /firefly/firefly /usr/bin/firefly
9999USER 1001
0 commit comments