Commit 0fa16e76 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

feat: remove glibc dependency

parent d5d51dda
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ variables:
  HELM_VERSION: 3.6.1
  KUBERNETES_VERSION: 1.17.17
  ALPINE_VERSION: '3.12'
  GLIBC_VERSION: 2.31-r0

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

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ build:
       --build-arg "HELM_VERSION=$HELM_VERSION"
       --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION"
       --build-arg "ALPINE_VERSION=$ALPINE_VERSION"
       --build-arg "GLIBC_VERSION=$GLIBC_VERSION"
       --tag "$BUILD_IMAGE_NAME" .
    - docker push "$BUILD_IMAGE_NAME"
    - export latest_tag="${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG}:latest"
+7 −0
Original line number Diff line number Diff line
@@ -43,11 +43,18 @@ kubesec-sast:
chart:test:
  extends: .chart-job
  stage: test
  variables:
    GLIBC_VERSION: 2.31-r0
  script:
    # install dependencies
    - apk add build-base
    - 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
    - wget https://golang.org/dl/go1.15.2.linux-amd64.tar.gz
    - tar -C /usr/local -xzf go1.15.2.linux-amd64.tar.gz
    - export PATH=$PATH:/usr/local/go/bin
    # run tests
    - go version
    - helm repo add stable https://charts.helm.sh/stable
    - helm dependency build .
+9 −9
Original line number Diff line number Diff line
@@ -4,16 +4,16 @@ ARG ALPINE_VERSION

FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}-alpine-${ALPINE_VERSION}"

# https://github.com/sgerrand/alpine-pkg-glibc
ARG GLIBC_VERSION

# Install Dependencies
RUN apk add --no-cache openssl curl tar gzip bash jq \
  && 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 \
  && apk add ruby jq ruby-json \
  && rm glibc-${GLIBC_VERSION}.apk
RUN apk add --no-cache \
  bash \
  curl \
  gzip \
  jq \
  openssl \
  ruby \
  ruby-json \
  tar

COPY src/ build/
COPY assets/ assets/