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

Merge branch 'operator-build-base-update-yq' into 'master'

Browse source 
[operator-build-base] Update yq to 4.7.0

See merge request gitlab-org/gitlab-build-images!398
This commit is contained in:
DJ Mountney 2021-04-27 19:31:02 +00:00
commit e2e3574568
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.gitlab-operator-build-base
View file

@ -4,7 +4,7 @@ LABEL maintainer="GitLab Distribution Team" \
description="Build base image for the GitLab Operator project." description="Build base image for the GitLab Operator project."
ARG KUBEBUILDER_VERSION=2.3.1 ARG KUBEBUILDER_VERSION=2.3.1
ARG YQ_VERSION=2.4.1 ARG YQ_VERSION=4.7.0
ARG HELM_VERSION=3.5.2 ARG HELM_VERSION=3.5.2
RUN go get -u \ RUN go get -u \
@ -13,7 +13,7 @@ RUN go get -u \
&& curl --retry 6 -Ls 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 \ && 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 \ && curl --retry 6 -LsO https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 \
&& chmod +x yq_linux_amd64 \ && chmod +x yq_linux_amd64 \
&& mv yq_linux_amd64 /usr/local/bin/yq \ && 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/ \ && curl --retry 6 -Ls "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar -xz -C /tmp/ \