Skip to content
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

[release-1.4] chore: bump trivy to v0.57.1 and use golang:1.22 in dockerfile #1702

Merged
merged 2 commits into from
Dec 5, 2024
Merged

[release-1.4] chore: bump trivy to v0.57.1 and use golang:1.22 in dockerfile #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d54527d
chore: bump trivy to v0.57.1 to mitigate rate limit issues
aramase Nov 19, 2024
80a2c34
chore: bump to golang 1.22 builder image in dockerfile
aramase Dec 4, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ KIND_VERSION ?= 0.23.0
KUBERNETES_VERSION ?= 1.30.2
KUBECTL_VERSION ?= 1.25.3
BATS_VERSION ?= 1.4.1
TRIVY_VERSION ?= 0.39.1
TRIVY_VERSION ?= 0.57.1
PROTOC_VERSION ?= 3.20.1
SHELLCHECK_VER ?= v0.8.0
YQ_VERSION ?= v4.11.2
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4

FROM golang:1.21@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7 as builder
FROM golang:1.22 as builder
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver
ADD . .
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion docker/crd.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

FROM alpine as builder
ARG KUBE_VERSION=v1.29.4
ARG KUBE_VERSION=v1.29.11
ARG TARGETARCH

RUN apk add --no-cache curl && \
Expand Down
2 changes: 1 addition & 1 deletion docker/windows.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG BASEIMAGE_CORE=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1

FROM --platform=linux/amd64 ${BASEIMAGE_CORE} as core

FROM --platform=$BUILDPLATFORM golang:1.21@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7 as builder
FROM --platform=$BUILDPLATFORM golang:1.22 as builder
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver
ADD . .
ARG TARGETARCH
Expand Down
Loading