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

Merge branch 'remove-terraform-from-charts-image' into 'master'

Browse source 
Remove terraform from gitlab-charts-build-base

See merge request gitlab-org/gitlab-build-images!121
This commit is contained in:
Marin Jankovski 2018-10-10 08:15:06 +00:00
commit 311bb35edb
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile.gitlab-charts-build-base
View file

@ -1,9 +1,6 @@
FROM ruby:2.4.4-alpine FROM ruby:2.4.4-alpine
MAINTAINER GitLab Distribution Team MAINTAINER GitLab Distribution Team
ENV TF_VERSION=0.11.1
ENV TF_URL=https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip
ENV HELM_VERSION=2.11.0 ENV HELM_VERSION=2.11.0
ENV HELM_URL=https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz ENV HELM_URL=https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz
@ -20,12 +17,6 @@ RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \
&& chmod +x /usr/local/bin/kubectl \ && chmod +x /usr/local/bin/kubectl \
&& kubectl version --client && kubectl version --client
# Install Terraform
RUN curl -LJO ${TF_URL} \
&& unzip terraform*.zip -d /usr/bin && chmod +x /usr/bin/terraform \
&& rm terraform*.zip \
&& terraform version
# Install Helm # Install Helm
RUN wget -q -O - ${HELM_URL} | tar zxf - \ RUN wget -q -O - ${HELM_URL} | tar zxf - \
&& mv linux-amd64/helm /usr/bin/ \ && mv linux-amd64/helm /usr/bin/ \