From 52c4d31eab16bd0a0400c7a22218e23d5f1e3890 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Tue, 22 Jun 2021 11:32:58 -0700 Subject: [PATCH] Add aws-cli to gitlab charts base image This is so we can switch to this image for the charts helm repo which uses s3 storage --- .gitlab-ci.yml | 8 ++++++-- Dockerfile.gitlab-charts-build-base-helm-3 | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 360bacc..7dd99a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,8 +102,10 @@ ruby-2.6.6-git-2.31-lfs-2.9-chrome-89-node-12.22-yarn-1.22-postgresql-9.5: *test # Used by customers-gitlab-com qa e2e test: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab/ci/e2e.gitlab-ci.yml ruby-2.7.2-git-2.31-chrome-89-node-12.22-yarn-1.22-docker-19.03.1: *test_custom -danger test: *test_build +# Used by https://gitlab.com/gitlab-org/charts/auto-deploy-app/-/blob/master/.gitlab-ci.yml alpine-helm test: *test_build + +danger test: *test_build gitlab-charts-build-base test: *test_build gitlab-charts-build-base-helm-3 test: *test_build gitlab-helm3.5-kubectl1.17 test: *test_build @@ -167,8 +169,10 @@ ruby-2.6.6-git-2.31-lfs-2.9-chrome-89-node-12.22-yarn-1.22-postgresql-9.5 push: # Used by customers-gitlab-com qa e2e test: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab/ci/e2e.gitlab-ci.yml ruby-2.7.2-git-2.31-chrome-89-node-12.22-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom -danger push: *build_and_deploy +# Used by https://gitlab.com/gitlab-org/charts/auto-deploy-app/-/blob/master/.gitlab-ci.yml alpine-helm push: *build_and_deploy + +danger push: *build_and_deploy gitlab-charts-build-base push: *build_and_deploy gitlab-charts-build-base-helm-3 push: *build_and_deploy gitlab-helm3.5-kubectl1.17 push: *build_and_deploy diff --git a/Dockerfile.gitlab-charts-build-base-helm-3 b/Dockerfile.gitlab-charts-build-base-helm-3 index e716198..2424a84 100644 --- a/Dockerfile.gitlab-charts-build-base-helm-3 +++ b/Dockerfile.gitlab-charts-build-base-helm-3 @@ -10,7 +10,7 @@ ENV KUBECTL_VERSION=1.16.4 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl # Install dependencies -RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2\ +RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2 py-pip groff\ && mkdir -p /opt # Install kubectl @@ -24,6 +24,9 @@ RUN wget -q -O - ${HELM_URL} | tar zxf - \ && chmod +x /usr/bin/helm \ && helm version --client -#Install kubeval +# Install kubeval RUN mkdir -p $HELM_HOME/plugins && \ helm plugin install https://github.com/instrumenta/helm-kubeval + +# Install aws cli +RUN pip install awscli \ No newline at end of file