diff --git a/Dockerfile b/Dockerfile index 7eca2e0b75..b6e1fa4027 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG VERSION=latest FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries FROM sapcc/kubernikus-docs:$VERSION as kubernikus-docs -FROM alpine:3.19 as kubernikus +FROM alpine:3.21 as kubernikus LABEL source_repository="https://github.com/sapcc/kubernikus" MAINTAINER "Fabian Ruff " RUN apk add --no-cache curl iptables diff --git a/Dockerfile.kubernikus b/Dockerfile.kubernikus index 7dc1ad2851..32f141d9a6 100644 --- a/Dockerfile.kubernikus +++ b/Dockerfile.kubernikus @@ -1,5 +1,5 @@ ARG DOCS_IMAGE=keppel.eu-de-1.cloud.sap/ccloud/kubernikus-docs-builder:latest -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.22-alpine3.19 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 as builder WORKDIR /app RUN apk add --no-cache make bash git curl gcc musl-dev RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 @@ -13,7 +13,7 @@ RUN make build-e2e FROM ${DOCS_IMAGE} as kubernikus-docs -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.19 as kubernikus +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.21 as kubernikus LABEL source_repository="https://github.com/sapcc/kubernikus" MAINTAINER "Fabian Ruff " RUN apk add --no-cache curl iptables diff --git a/Dockerfile.kubernikus-binaries b/Dockerfile.kubernikus-binaries index e52a246b2b..ad2abb2139 100644 --- a/Dockerfile.kubernikus-binaries +++ b/Dockerfile.kubernikus-binaries @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.22-alpine3.19 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 as builder RUN apk add --no-cache make git curl bash gcc musl-dev WORKDIR /app RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 diff --git a/Dockerfile.kubernikus-docs2 b/Dockerfile.kubernikus-docs2 index c72bd6419f..52a100cbfd 100644 --- a/Dockerfile.kubernikus-docs2 +++ b/Dockerfile.kubernikus-docs2 @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.19 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" ARG HUGO_VERSION=0.30.2 diff --git a/ci/task_checksum.yaml b/ci/task_checksum.yaml index de5b26f0db..fffa06ffae 100644 --- a/ci/task_checksum.yaml +++ b/ci/task_checksum.yaml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang - tag: 1.22-alpine3.19 + tag: 1.23-alpine3.21 inputs: - name: kubernikus.builds diff --git a/ci/task_cli.yaml b/ci/task_cli.yaml index 30f77c505b..b484a3fe68 100644 --- a/ci/task_cli.yaml +++ b/ci/task_cli.yaml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang - tag: 1.22-alpine3.19 + tag: 1.23-alpine3.21 inputs: - name: kubernikus.builds path: gopath/src/github.com/sapcc/kubernikus diff --git a/ci/task_e2e_tests.yaml b/ci/task_e2e_tests.yaml index d85826f9af..26b51061e5 100644 --- a/ci/task_e2e_tests.yaml +++ b/ci/task_e2e_tests.yaml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang - tag: 1.22-alpine3.19 + tag: 1.23-alpine3.21 inputs: - name: kubernikus.builds diff --git a/contrib/all/Dockerfile.apiserver b/contrib/all/Dockerfile.apiserver index b860458869..c0ef179c34 100644 --- a/contrib/all/Dockerfile.apiserver +++ b/contrib/all/Dockerfile.apiserver @@ -1,6 +1,6 @@ ARG IMAGE -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.16-alpine3.13 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 as builder WORKDIR / ADD api-liveness.go . diff --git a/contrib/k8sniff/Dockerfile b/contrib/k8sniff/Dockerfile index c6d44a0002..544072a5bc 100644 --- a/contrib/k8sniff/Dockerfile +++ b/contrib/k8sniff/Dockerfile @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.16-alpine3.13 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 WORKDIR /go/src/github.com/kubermatic/k8sniff @@ -12,7 +12,7 @@ RUN dep ensure RUN go build -v -o k8sniff . -FROM alpine:3.9 +FROM alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" RUN apk add --no-cache ca-certificates diff --git a/contrib/kubernikus-changelog-builder/Dockerfile b/contrib/kubernikus-changelog-builder/Dockerfile index 6100c88709..39db36ed45 100644 --- a/contrib/kubernikus-changelog-builder/Dockerfile +++ b/contrib/kubernikus-changelog-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" ENV GITHUB_CHANGELOG_GENERATOR_VERSION "1.14.3" diff --git a/contrib/kubernikus-docs-builder/Dockerfile b/contrib/kubernikus-docs-builder/Dockerfile index 07e9b3d0f3..6b55813351 100644 --- a/contrib/kubernikus-docs-builder/Dockerfile +++ b/contrib/kubernikus-docs-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.13 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" ARG HUGO_VERSION=0.30.2 diff --git a/contrib/kubernikus-terraform/Dockerfile b/contrib/kubernikus-terraform/Dockerfile index 1b805642d3..924bdea312 100644 --- a/contrib/kubernikus-terraform/Dockerfile +++ b/contrib/kubernikus-terraform/Dockerfile @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.16-alpine3.13 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 as builder RUN apk add --update git make bash gcc musl-dev zip @@ -21,7 +21,7 @@ RUN make # RUN XC_OS=linux XC_ARCH=amd64 make bin FROM sapcc/kubernikus-terraform:v20181113152146 as terraform11 -FROM alpine:3.8 +FROM alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" RUN apk add --update make ca-certificates diff --git a/contrib/kubernikus-tests/Dockerfile b/contrib/kubernikus-tests/Dockerfile index 663aa5cda8..1f56ea77d0 100644 --- a/contrib/kubernikus-tests/Dockerfile +++ b/contrib/kubernikus-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.16-alpine3.13 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" WORKDIR /go/src/github.com/sapcc/kubernikus/ diff --git a/contrib/kubernikusctl/Dockerfile b/contrib/kubernikusctl/Dockerfile index f0bddf925e..08fd5f3c3a 100644 --- a/contrib/kubernikusctl/Dockerfile +++ b/contrib/kubernikusctl/Dockerfile @@ -1,7 +1,7 @@ ARG VERSION=latest FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries -FROM alpine:3.8 +FROM alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" COPY --from=kubernikus-binaries /kubernikusctl /usr/local/bin/ CMD ["kubernikusctl"] diff --git a/contrib/multus-cni/Dockerfile b/contrib/multus-cni/Dockerfile index 7e09f36908..26b86f2fab 100644 --- a/contrib/multus-cni/Dockerfile +++ b/contrib/multus-cni/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.21 ARG TARGETOS ARG TARGETARCH ARG MULTUS_CNI_RELEASE diff --git a/contrib/serve_hostname/Dockerfile b/contrib/serve_hostname/Dockerfile index 69d0b92cca..d834957206 100644 --- a/contrib/serve_hostname/Dockerfile +++ b/contrib/serve_hostname/Dockerfile @@ -1,11 +1,11 @@ -FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.16-alpine3.13 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.23-alpine3.21 WORKDIR / RUN wget https://raw.githubusercontent.com/kubernetes/kubernetes/416974b8346bb1c219efe871c18a9f29de4fad2d/test/images/serve-hostname/serve_hostname.go RUN go build -o serve_hostname -FROM alpine:3.8 +FROM alpine:3.21 LABEL source_repository="https://github.com/sapcc/kubernikus" RUN apk add --no-cache curl bind-tools EXPOSE 9376