From 599bb4932889320ba0674f1bf3b34a9df2a20e5e Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 9 Apr 2024 11:40:05 +0000 Subject: [PATCH] Build www-gitlab-com images for arm64 --- .gitlab/ci/custom.images.yml | 6 ++++++ Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 | 2 ++ Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 | 2 ++ scripts/install-www-gitlab-com | 5 +++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 9652f37..cc13094 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -30,9 +30,15 @@ ubi-release: www-gitlab-com-debian-bullseye-ruby-3.0-node-16: extends: .build_static_image + parallel: + matrix: + - ARCH: [ 'arm64', 'amd64' ] www-gitlab-com-debian-bullseye-ruby-3.2-node-18: extends: .build_static_image + parallel: + matrix: + - ARCH: [ 'arm64', 'amd64' ] build-git: extends: .build_static_image diff --git a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 index d397c5a..9c5298f 100644 --- a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 +++ b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 @@ -6,6 +6,8 @@ ARG GCLOUD_VERSION=413.0.0 # permission: https://github.com/GoogleCloudPlatform/gsutil/issues/1663 FROM gcr.io/google.com/cloudsdktool/cloud-sdk:$GCLOUD_VERSION as gcloud-sdk FROM ruby:3.0.5-slim-bullseye +# pupulated by docker buildx build --platform flag +ARG TARGETARCH # 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/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 index 894227a..4e8724b 100644 --- a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 +++ b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 @@ -6,6 +6,8 @@ ARG GCLOUD_VERSION=413.0.0 # permission: https://github.com/GoogleCloudPlatform/gsutil/issues/1663 FROM gcr.io/google.com/cloudsdktool/cloud-sdk:$GCLOUD_VERSION as gcloud-sdk FROM ruby:3.2.2-slim-bullseye +# pupulated by docker buildx build --platform flag +ARG TARGETARCH # 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 e41ec6b..20c8d11 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -29,8 +29,9 @@ function build_debian() { /scripts/install-node "${NODE_INSTALL_VERSION}" "${YARN_INSTALL_VERSION}" # Install gitlab-runner - curl -O -J -L "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-${TARGETARCH:-amd64}" - mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper + TARGETARCH="${TARGETARCH:-amd64}" + curl -O -J -L "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-${TARGETARCH}" + mv "gitlab-ci-multi-runner-linux-${TARGETARCH}" /usr/bin/gitlab-runner-helper chmod +x /usr/bin/gitlab-runner-helper # Patch gsutil to support gzip compression with rsync command: