diff --git a/Dockerfile b/Dockerfile index 60ebff854..6d59a8bc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOTESTSUM_VERSION=v1.9.0 ARG DELVE_VERSION=v1.21.0 ARG GO_VERSION=1.21 -ARG ALPINE_VERSION=3.18 +ARG ALPINE_VERSION=3.19 ARG XX_VERSION=1.3.0 ARG BUILDKIT_DEBUG diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile index 87000603f..f48a7e2ba 100644 --- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile +++ b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile-upstream:master ARG GO_VERSION=1.21 +ARG ALPINE_VERSION=3.19 # xx is a helper for cross-compilation FROM --platform=$BUILDPLATFORM tonistiigi/xx:master@sha256:d4254d9739ce2de9fb88e09bdc716aa0c65f0446a2a2143399f991d71136a3d4 AS xx -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS base +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base RUN apk add git bash COPY --from=xx / / WORKDIR /src diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index aab2c17ca..61c00c2a4 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,6 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.21 +ARG ALPINE_VERSION=3.19 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index 2ca190d4b..67cfe7291 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -1,10 +1,11 @@ # syntax=docker/dockerfile-upstream:master -ARG GO_VERSION="1.21" -ARG PROTOC_VERSION="3.11.4" +ARG GO_VERSION=1.21 +ARG DEBIAN_VERSION=bookworm +ARG PROTOC_VERSION=3.11.4 # protoc is dynamically linked to glibc so can't use alpine base -FROM golang:${GO_VERSION}-bookworm AS base +FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS base RUN apt-get update && apt-get --no-install-recommends install -y git unzip ARG PROTOC_VERSION ARG TARGETOS diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 142010222..9f760ef73 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile-upstream:master ARG GO_VERSION=1.21 +ARG ALPINE_VERSION=3.19 ARG XX_VERSION=1.3.0 ARG PROTOLINT_VERSION=0.45.0 ARG GOLANGCI_LINT_VERSION=1.55.0 -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS golang-base +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang-base FROM --platform=$BUILDPLATFORM yoheimuta/protolint:${PROTOLINT_VERSION} AS protolint-base FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 0c8cdb98c..2989a7833 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile-upstream:master ARG GO_VERSION=1.21 +ARG ALPINE_VERSION=3.19 ARG MODOUTDATED_VERSION=v0.9.0 -FROM golang:${GO_VERSION}-alpine AS base +FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base RUN apk add --no-cache git rsync WORKDIR /src