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

Merge branch 'craigf/update-helm' into 'master'

Browse source 
Update Helm 2 to latest patch version

See merge request gitlab-org/gitlab-build-images!319
This commit is contained in:
Stan Hu 2020-08-04 15:32:19 +00:00
commit 25174a3ef3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
FROM ruby:2.6.5-alpine FROM ruby:2.6.5-alpine
MAINTAINER GitLab Distribution Team MAINTAINER GitLab Distribution Team
ENV HELM_VERSION=2.16.1 ENV HELM_VERSION=2.16.9
ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
ENV HELM_HOME=/root/.helm ENV HELM_HOME=/root/.helm

2
scripts/install-www-gitlab-com
View file

@ -37,7 +37,7 @@ YARN_INSTALL_VERSION=1.21.1-1
# Install yamllint # Install yamllint
# We need the latest version # We need the latest version
# https://packages.debian.org/testing/yamllint # https://packages.debian.org/testing/yamllint
YAMLLINT_VERSION=1.23.0 YAMLLINT_VERSION=1.24.2
echo "deb http://deb.debian.org/debian testing main" | tee -a /etc/apt/sources.list.d/testing.list echo "deb http://deb.debian.org/debian testing main" | tee -a /etc/apt/sources.list.d/testing.list
apt update apt update
apt -t testing install -yq yamllint=${YAMLLINT_VERSION}-1 apt -t testing install -yq yamllint=${YAMLLINT_VERSION}-1