Skip to content

fix: Dockerfile psql and trivy versions #1719

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

Merged
peterbroadhurst merged 5 commits into from
Mar 9, 2026
Merged

fix: Dockerfile psql and trivy versions #1719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33ee879
fix: Dockerfile psql and trivy versions
EnriqueL8 Mar 6, 2026
afb8289
Test against new FF CLI version with updated fabric images
EnriqueL8 Mar 9, 2026
96ee7f4
Try pulling image manually in github action
EnriqueL8 Mar 9, 2026
ed98e20
Only use tag for CLI version
EnriqueL8 Mar 9, 2026
c3ab571
Add explanation for pulling the image
EnriqueL8 Mar 9, 2026
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
9 changes: 9 additions & 0 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,15 @@ jobs:
- name: Load Docker image
run: docker load --input firefly.tar.gz

# Pre-pull fabric-ccenv so the Fabric peer's chaincode build finds it. Required on
# GitHub Actions with Docker 29: the peer invokes the host Docker build API to build
# chaincode (FROM hyperledger/fabric-ccenv:2.5); with Docker 29/containerd image store
# the base image is not always pulled automatically, causing "No such image" (see
# GitHub runner Docker 29 upgrade and moby/moby#51779 re multi-arch/image identity).
- name: Pull Fabric chaincode build image
if: matrix.stack-type == 'fabric'
run: docker pull hyperledger/fabric-ccenv:2.5

- name: Run E2E tests
env:
BUILD_FIREFLY: false
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ FROM alpine:3.21 AS sbom
WORKDIR /
ADD . /SBOM
RUN apk add --no-cache curl
RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.68.1
RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.69.3
RUN trivy fs --format spdx-json --output /sbom.spdx.json /SBOM
RUN trivy sbom /sbom.spdx.json --severity UNKNOWN,HIGH,CRITICAL --db-repository public.ecr.aws/aquasecurity/trivy-db --exit-code 1

Expand All @@ -76,7 +76,7 @@ ARG UI_TAG
ARG UI_RELEASE
RUN apk add --update --no-cache \
sqlite=3.48.0-r4 \
postgresql16-client=16.11-r0 \
postgresql16-client=16.12-r0 \
curl=8.14.1-r2 \
jq=1.7.1-r0
WORKDIR /firefly
Expand Down
Loading