Merge branch 'bump-base-image-versions' into 'master'

Bump the helm and kubectl used in the charts base image

See merge request gitlab-org/gitlab-build-images!226
This commit is contained in:
Stan Hu 2019-09-19 21:36:48 +00:00
commit 2631b2a1d2

View file

@ -1,11 +1,11 @@
FROM ruby:2.4.5-alpine
MAINTAINER GitLab Distribution Team
ENV HELM_VERSION=2.14.2
ENV HELM_VERSION=2.14.3
ENV HELM_URL=https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz
# kubectl (possibly in gcloud?)
ENV KUBECTL_VERSION=1.9.10
ENV KUBECTL_VERSION=1.12.10
ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
# Install dependencies