diff --git a/Dockerfile.www-gitlab-com-ruby-3.0-node-16 b/Dockerfile.www-gitlab-com-ruby-3.0-node-16 index 6d6fd6a..e90d68d 100644 --- a/Dockerfile.www-gitlab-com-ruby-3.0-node-16 +++ b/Dockerfile.www-gitlab-com-ruby-3.0-node-16 @@ -1,6 +1,6 @@ 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 COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 66d02e3..bb337b2 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -13,8 +13,7 @@ function build_debian() { make gcc g++ locales \ rsync git-core \ ed file curl gnupg2 \ - unzip \ - python3 python3-pip python3-crcmod python-minimal \ + yamllint unzip \ patch # Install Imagemagick for cropping the pictures on the team page @@ -25,13 +24,6 @@ function build_debian() { YARN_INSTALL_VERSION=1.22.10 /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 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