[pitivi/barthalion/buildah] ci: Switch to buildah for building Docker images




commit bb06fa405417c1ac7a3582705a70f324751033e7
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue Aug 4 07:33:48 2020 +0200

    ci: Switch to buildah for building Docker images

 .gitlab-ci.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15584300..d5bf5783 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,15 +12,20 @@ variables:
 
 
 .docker_image_template:
-  tags:
-    - privileged
-  image: docker:latest
+  image: registry.fedoraproject.org/fedora:32
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  services:
-    - docker:19.03.0-dind
+    STORAGE_DRIVER: 'vfs'
+    BUILDAH_FORMAT: 'docker'
+    BUILDAH_ISOLATION: 'chroot'
   script:
+    - dnf install -y buildah podman runc
+    - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
+    - |
+      cat >> /etc/containers/libpod.conf << END
+      cgroup_manager = "cgroupfs"
+      events_logger = "file"
+      END
+
     - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.34"
     - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.34"
     - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.34"
@@ -29,12 +34,11 @@ variables:
     - export BUILD_PITIVI="flatpak-builder --user --disable-rofiles-fuse ${BUILDDIR}/app 
${BUILDDIR}/build/flatpak/org.pitivi.Pitivi.json --state-dir=\${HOME}/flatpak-cache --ccache"
 
     - env
-
-    - docker run --privileged --name ${TMPIMAGENAME} ${BASE_IMAGE} bash -c "${CLONE_PITIVI} && 
${BUILD_PITIVI} && rm -Rf ${BUILDDIR}"
-    - docker commit ${TMPIMAGENAME} ${IMAGE}
-    - docker rm ${TMPIMAGENAME}
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker push ${IMAGE}
+    - CTR=$(buildah from ${BASE_IMAGE})
+    - buildah run $CTR bash -c "${CLONE_PITIVI} && ${BUILD_PITIVI} && rm -Rf ${BUILDDIR}"
+    - buildah commit $CTR ${IMAGE}
+    - buildah login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - buildah push ${IMAGE}
   only:
     - triggers
     - schedules


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]