From f8b01d2ef80e46f513e11d9b4039f3e8db1d8d72 Mon Sep 17 00:00:00 2001 From: Hossein Pursultani Date: Tue, 2 Mar 2021 20:39:01 +0000 Subject: [PATCH] Add Helm to Operator build image Also includes cleanups --- Dockerfile.gitlab-operator-build-base | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile.gitlab-operator-build-base b/Dockerfile.gitlab-operator-build-base index dbd14a0..ed7e473 100644 --- a/Dockerfile.gitlab-operator-build-base +++ b/Dockerfile.gitlab-operator-build-base @@ -5,14 +5,19 @@ LABEL maintainer="GitLab Distribution Team" \ ARG KUBEBUILDER_VERSION=2.3.1 ARG YQ_VERSION=2.4.1 +ARG HELM_VERSION=3.5.2 RUN go get -u \ github.com/onsi/ginkgo/ginkgo \ golang.org/x/lint/golint \ - && curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERSION}/linux/amd64 | tar -xz -C /tmp/ \ + && curl --retry 6 -Ls https://go.kubebuilder.io/dl/${KUBEBUILDER_VERSION}/linux/amd64 | tar -xz -C /tmp/ \ && mv /tmp/kubebuilder_${KUBEBUILDER_VERSION}_linux_amd64 /usr/local/kubebuilder \ - && ln -sfv /usr/local/kubebuilder/bin/* /usr/local/bin + && ln -sfv /usr/local/kubebuilder/bin/* /usr/local/bin \ + && curl --retry 6 -LsO https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 \ + && chmod +x yq_linux_amd64 \ + && mv yq_linux_amd64 /usr/local/bin/yq \ + && curl --retry 6 -Ls "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar -xz -C /tmp/ \ + && chmod +x /tmp/linux-amd64/helm \ + && mv /tmp/linux-amd64/helm /usr/local/bin/helm \ + && rm -rf /var/lib/apt/lists/* /tmp/* -RUN curl --retry 6 -LsO https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 \ - && chmod +x yq_linux_amd64 \ - && mv yq_linux_amd64 /usr/local/bin/yq