From 7b97cf9dbd409b61f5e4e9647d6855533ce19cd8 Mon Sep 17 00:00:00 2001 From: Erik Schubert Date: Tue, 20 Jun 2023 18:31:02 +0200 Subject: [PATCH] Update dependencies in CI (#814) --- Dockerfile | 2 +- Dockerfile.kubernikus | 6 +++--- Dockerfile.kubernikus-binaries | 2 +- Dockerfile.kubernikus-docs2 | 2 +- ci/task_checksum.yaml | 2 +- ci/task_cli.yaml | 2 +- ci/task_e2e_tests.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3fa8b1b26..c7e36d1939 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.15 as kubernikus +FROM alpine:3.18 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 5cd6bde3e6..bedaee6283 100644 --- a/Dockerfile.kubernikus +++ b/Dockerfile.kubernikus @@ -1,8 +1,8 @@ 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.18-alpine3.15 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.20-alpine3.18 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.50.0 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2 COPY . . ENV GOARCH=amd64 ARG VERSION @@ -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.15 as kubernikus +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.18 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 d91936cce0..8b06fbe609 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.18-alpine3.15 as builder +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.20-alpine3.18 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.50.0 diff --git a/Dockerfile.kubernikus-docs2 b/Dockerfile.kubernikus-docs2 index d81d482f92..5a8faaed81 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.15 +FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.18 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 b9a2696600..bd90a156a5 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.18-alpine + tag: 1.20-alpine inputs: - name: kubernikus.builds diff --git a/ci/task_cli.yaml b/ci/task_cli.yaml index 1e64b180ea..22cc7b2f9d 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.18-alpine + tag: 1.20-alpine 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 5af24899fb..fff68e8e3f 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.18-alpine + tag: 1.20-alpine inputs: - name: kubernikus.builds