Commit 73866c99 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Add aarch64 bootstrap image


Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent 31feecb3
......@@ -30,11 +30,10 @@ include:
variables:
BOOTSTRAP_TAG: '2019-08-06.0'
BOOTSTRAP_TAG: '2019-08-13.0'
stages:
- bootstrapping_check
- bootstrapping
- arch_container_build
- arch_check
......@@ -51,6 +50,10 @@ bootstrap:
extends: .bootstrap
bootstrap@arm64v8:
extends: .bootstrap@arm64v8
#
# Everything went fine if this is run, we can promote the latest bootstrap
# tag as latest
......@@ -63,6 +66,15 @@ bootstrap-push@push:
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# push the container image to the registry
- skopeo copy docker://$CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG docker://$CI_REGISTRY_IMAGE/buildah:latest
- skopeo copy docker://$CI_REGISTRY_IMAGE/${ARCH}buildah:$BOOTSTRAP_TAG docker://$CI_REGISTRY_IMAGE/${ARCH}buildah:latest
variables:
GIT_STRATEGY: none
bootstrap-push@arm64v8:
extends: bootstrap-push@push
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:$BOOTSTRAP_TAG
before_script:
- export ARCH="arm64v8/"
tags:
- aarch64
......@@ -17,7 +17,7 @@
.bootstrap:
image: fedora:latest
stage: bootstrapping
before_script:
script:
- export BUILDAH_RUN="buildah run --isolation chroot"
- export BUILDAH_COMMIT="buildah commit --format docker"
# install buildah, podman and skopeo
......@@ -39,11 +39,10 @@
# check if our image is already in the current registry
- skopeo inspect docker://$CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG > /dev/null && exit 0 || true
script:
# https://gitlab.com/gitlab-com/support-forum/issues/4349
- export BUILDAH_FORMAT=docker
- buildcntr=$(buildah from fedora:30)
- buildcntr=$(buildah from ${ARCH}fedora:30)
- $BUILDAH_RUN $buildcntr dnf upgrade -y
- $BUILDAH_RUN $buildcntr dnf install -y buildah podman skopeo jq git
# do not store the packages database, it's pointless
......@@ -120,7 +119,7 @@
- $BUILDAH_RUN $buildcntr podman images || true
# tag the current container
- $BUILDAH_COMMIT $buildcntr $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
- $BUILDAH_COMMIT $buildcntr $CI_REGISTRY_IMAGE/${ARCH}buildah:$BOOTSTRAP_TAG
# clean up the working container
- buildah rm $buildcntr
......@@ -128,6 +127,15 @@
# bug when pushing 2 tags in the same repo with the same base,
# this may fail. Just retry it after
- podman push $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG || true
- podman push $CI_REGISTRY_IMAGE/${ARCH}buildah:$BOOTSTRAP_TAG || true
- sleep 2
- podman push $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
- podman push $CI_REGISTRY_IMAGE/${ARCH}buildah:$BOOTSTRAP_TAG
.bootstrap@arm64v8:
extends: .bootstrap
image: arm64v8/fedora:latest
tags:
- aarch64
before_script:
- export ARCH="arm64v8/"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment