diff --git a/Dockerfile b/Dockerfile index 9d8827327c..f0d5dfb121 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.21.4 +FROM alpine:3.22.1 RUN apk --no-cache add ca-certificates git COPY trivy /usr/local/bin/trivy COPY contrib/*.tpl contrib/ diff --git a/Dockerfile.canary b/Dockerfile.canary index 68c3d98c0f..4b45fdcc7a 100644 --- a/Dockerfile.canary +++ b/Dockerfile.canary @@ -1,10 +1,10 @@ -FROM alpine:3.21.4 +FROM alpine:3.22.1 RUN apk --no-cache add ca-certificates git # binaries were created with GoReleaser # need to copy binaries from folder with correct architecture # example architecture folder: dist/trivy_canary_build_linux_arm64/trivy -# GoReleaser adds _v* to the folder name, but only when GOARCH is amd64 +# GoReleaser adds _v* to the folder name, but only when GOARCH is amd64 ARG TARGETARCH COPY "dist/trivy_canary_build_linux_${TARGETARCH}*/trivy" /usr/local/bin/trivy COPY contrib/*.tpl contrib/