NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 02:52:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add aws-cli to gitlab charts base image

Browse source 
This is so we can switch to this image for the charts helm repo which
uses s3 storage
This commit is contained in:
DJ Mountney 2021-06-22 11:32:58 -07:00
parent ea8efa68bc
commit 52c4d31eab
No known key found for this signature in database
GPG key ID: F07F8D51346CF0B6
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -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 # 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 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 alpine-helm test: *test_build
danger test: *test_build
gitlab-charts-build-base test: *test_build gitlab-charts-build-base test: *test_build
gitlab-charts-build-base-helm-3 test: *test_build gitlab-charts-build-base-helm-3 test: *test_build
gitlab-helm3.5-kubectl1.17 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 # 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 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 alpine-helm push: *build_and_deploy
danger push: *build_and_deploy
gitlab-charts-build-base push: *build_and_deploy gitlab-charts-build-base push: *build_and_deploy
gitlab-charts-build-base-helm-3 push: *build_and_deploy gitlab-charts-build-base-helm-3 push: *build_and_deploy
gitlab-helm3.5-kubectl1.17 push: *build_and_deploy gitlab-helm3.5-kubectl1.17 push: *build_and_deploy

7
Dockerfile.gitlab-charts-build-base-helm-3
View file

@ -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 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
# Install dependencies # 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 && mkdir -p /opt
# Install kubectl # Install kubectl
@ -24,6 +24,9 @@ RUN wget -q -O - ${HELM_URL} | tar zxf - \
&& chmod +x /usr/bin/helm \ && chmod +x /usr/bin/helm \
&& helm version --client && helm version --client
#Install kubeval # Install kubeval
RUN mkdir -p $HELM_HOME/plugins && \ RUN mkdir -p $HELM_HOME/plugins && \
helm plugin install https://github.com/instrumenta/helm-kubeval helm plugin install https://github.com/instrumenta/helm-kubeval
# Install aws cli
RUN pip install awscli