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

Update debian from buster to bullseye in www-gitlab-com

Browse source 
to update yamllint from 1.25.0 to 1.26.0-2

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
This commit is contained in:
Takuya Noguchi 2022-08-14 09:04:32 +00:00
parent ec6bf89cf6
commit 8fdc02afff
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.www-gitlab-com-ruby-3.0-node-16
View file

@ -1,6 +1,6 @@
FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk
FROM ruby:3.0.4-slim-buster FROM ruby:3.0.4-slim-bullseye
# Install Google Cloud SDK for deploys via rsync # Install Google Cloud SDK for deploys via rsync
COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk

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

@ -13,8 +13,7 @@ function build_debian() {
make gcc g++ locales \ make gcc g++ locales \
rsync git-core \ rsync git-core \
ed file curl gnupg2 \ ed file curl gnupg2 \
unzip \ yamllint unzip \
python3 python3-pip python3-crcmod python-minimal \
patch patch
# Install Imagemagick for cropping the pictures on the team page # Install Imagemagick for cropping the pictures on the team page
@ -25,13 +24,6 @@ function build_debian() {
YARN_INSTALL_VERSION=1.22.10 YARN_INSTALL_VERSION=1.22.10
/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
# Install yamllint
# We need version 1.25.0+: https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst
YAMLLINT_VERSION=1.25.0
# Temporarily pin pyyaml and pathspec to reduce compatibility with packages from Debian bullseye (testing)
pip3 install yamllint==${YAMLLINT_VERSION} pyyaml==5.4.1 pathspec==0.8.1
# Install gitlab-runner # Install gitlab-runner
curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64
mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper