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

Merge branch 'fix-gitlab-runner-binary-arch' into 'master'

Browse source 
Build www-gitlab-com images for arm64

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/792

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Alessio Caiazza <acaiazza@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2024-04-09 11:40:06 +00:00
commit 19ce50799c
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab/ci/custom.images.yml
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

2
Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16
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

2
Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18
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

5
scripts/install-www-gitlab-com
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: