From f0eb78b873378b00e29fc19b4b01efecb4d963bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20G=C3=A1mez=2C=20PhD?= Date: Mon, 8 Jan 2024 16:27:19 +0100 Subject: [PATCH] Update dockerfiles (#7229) ### Description of the change Upgrading the versions of the components used in our container images. Note this is only used for development; our official chart release by Bitnami do not get affected by this change. ### Benefits Up to date dependencies. ### Possible drawbacks N/A ### Applicable issues N/A ### Additional information N/A --------- Signed-off-by: Antonio Gamez Diaz --- .github/workflows/kubeapps-general.yaml | 2 +- cmd/apprepository-controller/Dockerfile | 10 +++++----- cmd/asset-syncer/Dockerfile | 10 +++++----- cmd/kubeapps-apis/Dockerfile | 14 +++++++------- cmd/oci-catalog/Dockerfile | 6 +++--- cmd/pinniped-proxy/Dockerfile | 4 ++-- dashboard/Dockerfile | 6 +++--- integration/Dockerfile | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml index a01349aa9ec..6dedc501c31 100644 --- a/.github/workflows/kubeapps-general.yaml +++ b/.github/workflows/kubeapps-general.yaml @@ -60,7 +60,7 @@ env: NODE_VERSION: "20.10.0" OLM_VERSION: "v0.26.0" POSTGRESQL_VERSION: "16.1.0-debian-11-r16" - RUST_VERSION: "1.74.1" + RUST_VERSION: "1.75.0" SEMVER_VERSION: "3.4.0" GKE_STABLE_VERSION: "1.27.9" GKE_REGULAR_VERSION: "1.27.9" diff --git a/cmd/apprepository-controller/Dockerfile b/cmd/apprepository-controller/Dockerfile index 956b876e0dd..68d88b508c6 100644 --- a/cmd/apprepository-controller/Dockerfile +++ b/cmd/apprepository-controller/Dockerfile @@ -1,9 +1,9 @@ -# Copyright 2018-2023 the Kubeapps contributors. +# Copyright 2018-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.21.1 as builder +FROM bitnami/golang:1.21.5 as builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg @@ -14,9 +14,9 @@ ARG VERSION ARG lint # https://github.com/golangci/golangci-lint/releases -ARG GOLANGCILINT_VERSION="1.53.3" +ARG GOLANGCILINT_VERSION="1.55.2" -RUN if [ ! -z "$lint" ]; then \ +RUN if [ ! -z ${lint:-} ]; then \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILINT_VERSION && \ # Run golangci-lint to detect issues golangci-lint run --timeout=10m ./cmd/apprepository-controller/... && \ @@ -27,7 +27,7 @@ RUN if [ ! -z "$lint" ]; then \ # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - GOPROXY="https://proxy.golang.org,direct" CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd.version=$VERSION" ./cmd/apprepository-controller + GOPROXY="https://proxy.golang.org,direct" CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd.version=${VERSION:-}" ./cmd/apprepository-controller FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ diff --git a/cmd/asset-syncer/Dockerfile b/cmd/asset-syncer/Dockerfile index 357b2f6c4f1..b232c93339d 100644 --- a/cmd/asset-syncer/Dockerfile +++ b/cmd/asset-syncer/Dockerfile @@ -1,9 +1,9 @@ -# Copyright 2020-2023 the Kubeapps contributors. +# Copyright 2020-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.21.1 as builder +FROM bitnami/golang:1.21.5 as builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg @@ -14,9 +14,9 @@ ARG VERSION ARG lint # https://github.com/golangci/golangci-lint/releases -ARG GOLANGCILINT_VERSION="1.53.3" +ARG GOLANGCILINT_VERSION="1.55.2" -RUN if [ ! -z "$lint" ]; then \ +RUN if [ ! -z ${lint:-} ]; then \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILINT_VERSION && \ # Run golangci-lint to detect issues golangci-lint run --timeout=10m ./cmd/asset-syncer/... && \ @@ -27,7 +27,7 @@ RUN if [ ! -z "$lint" ]; then \ # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - GOPROXY="https://proxy.golang.org,direct" CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd.version=$VERSION" ./cmd/asset-syncer + GOPROXY="https://proxy.golang.org,direct" CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd.version=${VERSION:-}" ./cmd/asset-syncer FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ diff --git a/cmd/kubeapps-apis/Dockerfile b/cmd/kubeapps-apis/Dockerfile index 3bc9ad9156b..30f9d91d7ae 100644 --- a/cmd/kubeapps-apis/Dockerfile +++ b/cmd/kubeapps-apis/Dockerfile @@ -1,9 +1,9 @@ -# Copyright 2021-2023 the Kubeapps contributors. +# Copyright 2021-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.21.1 as builder +FROM bitnami/golang:1.21.5 as builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ ARG VERSION="devel" @@ -13,16 +13,16 @@ ARG TARGETARCH ARG lint # https://github.com/bufbuild/buf/releases/ -ARG BUF_VERSION="1.26.0" +ARG BUF_VERSION="1.28.1" # https://github.com/golangci/golangci-lint/releases -ARG GOLANGCILINT_VERSION="1.53.3" +ARG GOLANGCILINT_VERSION="1.55.2" # https://github.com/grpc-ecosystem/grpc-health-probe/releases/ -ARG GRPC_HEALTH_PROBE_VERSION="0.4.19" +ARG GRPC_HEALTH_PROBE_VERSION="0.4.24" # Install lint tools -RUN if [ ! -z "$lint" ]; then \ +RUN if [ ! -z ${lint:-} ]; then \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILINT_VERSION; \ fi @@ -43,7 +43,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ COPY pkg pkg COPY cmd cmd -RUN if [ ! -z "$lint" ]; then \ +RUN if [ ! -z ${lint:-} ]; then \ # Run golangci-lint to detect issues golangci-lint run --timeout=10m ./cmd/kubeapps-apis/... && \ golangci-lint run --timeout=10m ./pkg/...; \ diff --git a/cmd/oci-catalog/Dockerfile b/cmd/oci-catalog/Dockerfile index 46ad169c659..337966e9ef6 100644 --- a/cmd/oci-catalog/Dockerfile +++ b/cmd/oci-catalog/Dockerfile @@ -1,16 +1,16 @@ -# Copyright 2023 the Kubeapps contributors. +# Copyright 2023-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 # syntax = docker/dockerfile:1 -FROM rust:1.72.0 as builder +FROM rust:1.75.0 as builder WORKDIR /oci-catalog ARG VERSION="devel" ARG TARGETARCH # https://github.com/grpc-ecosystem/grpc-health-probe/releases/ -ARG GRPC_HEALTH_PROBE_VERSION="0.4.19" +ARG GRPC_HEALTH_PROBE_VERSION="0.4.24" # Ensure protoc is available for the build.rs step. RUN apt-get update && apt-get -y install --no-install-recommends protobuf-compiler && rm -rf /var/lib/apt/lists/* diff --git a/cmd/pinniped-proxy/Dockerfile b/cmd/pinniped-proxy/Dockerfile index 299757afc36..076bb3a939c 100644 --- a/cmd/pinniped-proxy/Dockerfile +++ b/cmd/pinniped-proxy/Dockerfile @@ -1,9 +1,9 @@ -# Copyright 2020-2023 the Kubeapps contributors. +# Copyright 2020-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 # syntax = docker/dockerfile:1 -FROM rust:1.72.0 as builder +FROM rust:1.75.0 as builder WORKDIR /pinniped-proxy ARG VERSION diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile index c9bc33c3ad1..cade2aec485 100644 --- a/dashboard/Dockerfile +++ b/dashboard/Dockerfile @@ -1,7 +1,7 @@ -# Copyright 2018-2023 the Kubeapps contributors. +# Copyright 2018-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 -FROM bitnami/node:18.18.0 AS build +FROM bitnami/node:20.10.0 AS build WORKDIR /app COPY package.json yarn.lock /app/ @@ -12,5 +12,5 @@ COPY . /app RUN yarn run prettier-check && yarn run ts-compile-check RUN yarn run build -FROM bitnami/nginx:1.25.2 +FROM bitnami/nginx:1.25.3 COPY --from=build /app/build /app diff --git a/integration/Dockerfile b/integration/Dockerfile index 8c925de94df..79af9f0c618 100644 --- a/integration/Dockerfile +++ b/integration/Dockerfile @@ -1,7 +1,7 @@ -# Copyright 2019-2022 the Kubeapps contributors. +# Copyright 2019-2024 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 -FROM mcr.microsoft.com/playwright:v1.38.0-jammy +FROM mcr.microsoft.com/playwright:v1.40.1-jammy WORKDIR /app/ # Copy and install deps