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

Bump build to golang 1.23 #958

Merged
merged 4 commits into from
Dec 12, 2024
Merged

Bump build to golang 1.23 #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a7351f
Bump build to golang 1.23
jknipper Dec 12, 2024
e5a8934
Bump alpine to 3.21
jknipper Dec 12, 2024
de47f5e
Bump alpine base images as well
jknipper Dec 12, 2024
c759dc7
Bump more alpine images
jknipper Dec 12, 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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
RUN apk add --no-cache curl iptables
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.kubernikus
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 <[email protected]>"
RUN apk add --no-cache curl iptables
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.kubernikus-binaries
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.kubernikus-docs2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/task_checksum.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/task_cli.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/task_e2e_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/all/Dockerfile.apiserver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
4 changes: 2 additions & 2 deletions contrib/k8sniff/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/kubernikus-changelog-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/kubernikus-docs-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/kubernikus-terraform/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/kubernikus-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion contrib/kubernikusctl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion contrib/multus-cni/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16
FROM alpine:3.21
ARG TARGETOS
ARG TARGETARCH
ARG MULTUS_CNI_RELEASE
Expand Down
4 changes: 2 additions & 2 deletions contrib/serve_hostname/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading