diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c81359fbe5e2ef17498eada58a364edd0846fa6..c16d062b7e0434980daae2c2b8aa118acb3c557b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,9 @@ workflow: variables: DOCKER_DRIVER: overlay2 - HELM_VERSION: '3.7.1' - KUBERNETES_VERSION: '1.20.11' - ALPINE_VERSION: '3.14' + # See https://gitlab.com/gitlab-org/cluster-integration/helm-install-image/container_registry/3232113 + HELM_INSTALL_IMAGE_VERSION: v0.241-helm-3.7.2-kube-1.21.5-alpine-3.15 + GLIBC_VERSION: 2.31-r0 BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA" diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml index 8beff1033cb9e3d182d54b3c249d90407471e0ea..cb6756130fd0c696f367d29024bab818c6011e0a 100644 --- a/.gitlab/ci/build.gitlab-ci.yml +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -22,9 +22,7 @@ build: - >- docker buildx build --platform "$PLATFORMS" - --build-arg "HELM_VERSION=$HELM_VERSION" - --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION" - --build-arg "ALPINE_VERSION=$ALPINE_VERSION" + --build-arg "HELM_INSTALL_IMAGE_VERSION=$HELM_INSTALL_IMAGE_VERSION" --build-arg "GLIBC_VERSION=$GLIBC_VERSION" --tag "$BUILD_IMAGE_NAME" --tag "$BUILD_IMAGE_LATEST" diff --git a/Dockerfile b/Dockerfile index 7fea345547576a6ae5a19655eeb941d0f0a5b773..55b36ceed782cb8959ebe5e9ce37044758b34287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ -ARG HELM_VERSION -ARG KUBERNETES_VERSION -ARG ALPINE_VERSION +ARG HELM_INSTALL_IMAGE_VERSION -FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}-alpine-${ALPINE_VERSION}" +FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image:${HELM_INSTALL_IMAGE_VERSION}" # https://github.com/sgerrand/alpine-pkg-glibc ARG GLIBC_VERSION