Build www-gitlab-com images for arm64

This commit is contained in:
Alessio Caiazza 2024-04-09 11:40:05 +00:00 committed by Balasankar 'Balu' C
parent ace7190648
commit 599bb49328
4 changed files with 13 additions and 2 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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: