Commit b04cd317 authored by Tiger Watson's avatar Tiger Watson
Browse files

Merge branch 'master-patch-4004' into 'master' 

Upgrade to latest helm-install-image

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/333



Merged-by: default avatarTiger Watson <twatson@gitlab.com>
Approved-by: default avatarTiger Watson <twatson@gitlab.com>
Co-authored-by: default avatarTimo Furrer <tfurrer@gitlab.com>
parents 30488328 58a6cbbb

.gitlab-ci.yml

+2 −5
Original line number Diff line number Diff line
@@ -7,11 +7,8 @@ workflow: 
variables:

  DOCKER_DRIVER: overlay2



  # See https://gitlab.com/gitlab-org/cluster-integration/helm-install-image/container_registry/3232113

  HELM_INSTALL_IMAGE_VERSION: v0.274-helm-3.10.2-kube-1.24.8-alpine-3.15





  GLIBC_VERSION: 2.31-r0

  # See https://gitlab.com/gitlab-org/cluster-integration/helm-install-image/container_registry

  HELM_INSTALL_IMAGE_VERSION: v0.324-helm-3.11.3-kube-1.26.4-alpine-3.18.0



  BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"

.gitlab/ci/build.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ build: 
       docker buildx build

       --platform "$PLATFORMS"

       --build-arg "HELM_INSTALL_IMAGE_VERSION=$HELM_INSTALL_IMAGE_VERSION"

       --build-arg "GLIBC_VERSION=$GLIBC_VERSION"

       --tag "$BUILD_IMAGE_NAME"

       --tag "$BUILD_IMAGE_LATEST"

       --push

Dockerfile

+2 −11
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ ARG HELM_INSTALL_IMAGE_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



# Magic ARG provided by docker

ARG TARGETARCH
@@ -20,14 +17,8 @@ RUN apk add -u --no-cache \ 
  ruby-json \

  tar



# Install legacy glibc dependency on amd64

RUN \

  if [[ "$TARGETARCH" = "amd64" ]]; then \

    curl -sSL -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \

      && curl -sSL -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \

      && apk add glibc-${GLIBC_VERSION}.apk \

      && rm glibc-${GLIBC_VERSION}.apk; \

  fi

# Install libc compatibility pkg using musl

RUN apk add -u --no-cache libc6-compat



COPY src/ build/

COPY assets/ assets/