Merge branch 'add-alpine-helm' into 'master'

Add alpine-helm image used in Charts

See merge request gitlab-org/gitlab-build-images!221
This commit is contained in:
Stan Hu 2019-09-05 09:54:01 +00:00
commit 3a547d7398
2 changed files with 6 additions and 0 deletions

View file

@ -78,6 +78,7 @@ ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
danger test: *test_build
alpine-aws test: *test_build
alpine-helm test: *test_build
ruby-alpine-aws test: *test_build
gitlab-charts-build-base test: *test_build
gitlab-qa test: *test_build
@ -126,6 +127,7 @@ ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
danger: *build_and_deploy
alpine-aws: *build_and_deploy
alpine-helm: *build_and_deploy
ruby-alpine-aws: *build_and_deploy
gitlab-charts-build-base: *build_and_deploy
gitlab-qa: *build_and_deploy

4
Dockerfile.alpine-helm Normal file
View file

@ -0,0 +1,4 @@
FROM ruby:2.4-alpine
RUN apk --no-cache add curl bash openssl sudo git py-pip groff
RUN curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
RUN pip install awscli