Setup multi arch builds

Author: Taucher2003

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - container
   - container:boot
 
-default:
+.default-retry:
   retry:
     max: 2
     when:

.gitlab/ci/container-boot.gitlab-ci.yml

@@ -1,6 +1,7 @@
 .container:boot:
   extends:
     - .dind
+    - .default-retry
   stage: container:boot
   image: ghcr.io/code0-tech/build-images/reticulum-builder:207.1-ruby-3.2.2
   variables:

.gitlab/ci/container-build.gitlab-ci.yml

@@ -1,11 +1,15 @@
 .image-build-base:
   extends:
     - .dind
+    - .default-retry
   image: ghcr.io/code0-tech/build-images/reticulum-builder:207.1-ruby-3.2.2
   stage: container
+  variables:
+    PLATFORM_ARGS: "--platform linux/amd64,linux/arm64"
   script:
     - source support/helpers.sh
     - docker_login
+    - docker_setup_multi_arch
     - 'image=$(echo "$CI_JOB_NAME" | cut -d : -f 2)'
     - '[ -z "$NEED_PROJECT_DOWNLOAD" ] || download_project $image'
   retry:
@@ -17,18 +21,14 @@
     - .image-build-base
   script:
     - !reference [.image-build-base, script]
-    - build_image $image $CI_PIPELINE_ID
-    - push_image $image $CI_PIPELINE_ID
+    - build_image $image $CI_PIPELINE_ID "--push"
 
 .variant-image-build-base:
   extends:
     - .image-build-base
   script:
     - !reference [.image-build-base, script]
-    - build_image $image $CI_PIPELINE_ID "--build-arg VARIANT=$VARIANT"
-    - image_tag=$(get_image_tag $CI_PIPELINE_ID $VARIANT)
-    - retag_image $image $CI_PIPELINE_ID $image_tag
-    - push_image $image $image_tag
+    - build_image $image $CI_PIPELINE_ID "--build-arg VARIANT=$VARIANT --push" $(get_image_tag $CI_PIPELINE_ID $VARIANT)
 
 container:mise:
   extends:

container/ruby/Dockerfile

@@ -2,8 +2,8 @@ ARG RETICULUM_IMAGE_TAG=local
 
 FROM ghcr.io/code0-tech/reticulum/ci-builds/mise:$RETICULUM_IMAGE_TAG
 
-ARG RUBY_VERSION=3.2.2
+ARG RUBY_VERSION=3.4.7
 
 RUN apk add --update --no-cache build-base tzdata zlib-dev perl linux-headers libffi readline yaml-dev
-RUN mise install-into ruby@$RUBY_VERSION /usr/local/share/ruby
+RUN mise install-into ruby@$RUBY_VERSION /usr/local/share/ruby; exit_code=$?; [ $exit_code -ne 0 ] && tail -n 500 /tmp/ruby-build.*.log; exit $exit_code
 ENV PATH=/usr/local/share/ruby/bin:$PATH

support/helpers.sh

@@ -13,10 +13,22 @@ function docker_login() {
   echo $C0_GH_TOKEN | docker login -u $ --password-stdin ghcr.io
 }
 
+function docker_setup_multi_arch() {
+  docker context create build-context
+  docker buildx create \
+    --name container-builder \
+    --driver docker-container \
+    --bootstrap \
+    --use \
+    build-context
+  docker run --privileged --rm tonistiigi/binfmt --install all
+}
+
 function build_image() {
   image=$1
   reticulum_tag=$2
   build_args=$3
+  reticulum_push_tag=${4:-$reticulum_tag}
 
   echo "Building image for $image"
 
@@ -25,27 +37,15 @@ function build_image() {
     container/$image/renderDockerfile
   fi
 
-  docker build \
-    -t "ghcr.io/code0-tech/reticulum/ci-builds/$image:$reticulum_tag" \
+  docker buildx build \
+    -t "ghcr.io/code0-tech/reticulum/ci-builds/$image:$reticulum_push_tag" \
     -f "container/$image/Dockerfile" \
     --build-arg RETICULUM_IMAGE_TAG=$reticulum_tag \
     $build_args \
+    $PLATFORM_ARGS \
     .
 }
 
-function push_image() {
-  image=$1
-  reticulum_tag=$2
-  docker push "ghcr.io/code0-tech/reticulum/ci-builds/$image:$reticulum_tag"
-}
-
-function retag_image() {
-  image=$1
-  reticulum_tag=$2
-  variant_tag=$3
-  docker image tag "ghcr.io/code0-tech/reticulum/ci-builds/$image:$reticulum_tag" "ghcr.io/code0-tech/reticulum/ci-builds/$image:$variant_tag"
-}
-
 function get_image_tag() {
   reticulum_tag=$1
   reticulum_variant=$2