From e9e83605f7891c67507fdbf516c29f09140dadb1 Mon Sep 17 00:00:00 2001 From: Ian Baum Date: Thu, 4 Oct 2018 17:00:56 -0500 Subject: [PATCH] Remove terraform from gitlab-charts-build-base Switching to external-dns removes this requirement --- Dockerfile.gitlab-charts-build-base | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base index fa7fc5e..ed2ad36 100644 --- a/Dockerfile.gitlab-charts-build-base +++ b/Dockerfile.gitlab-charts-build-base @@ -1,9 +1,6 @@ FROM ruby:2.4.4-alpine 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_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 \ && 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 RUN wget -q -O - ${HELM_URL} | tar zxf - \ && mv linux-amd64/helm /usr/bin/ \