gitlab-ci: force using docker format for the generated images

See https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/178#note_203050

Some shared runners are not capable of understanding OCI format for
container images, and they are failing.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e79400..02a12ff 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,15 +27,15 @@
 include:
   # Arch container builder template
   - project: 'wayland/ci-templates'
-    ref: adfcd8c318d3398d0547960e45daa34d3b48bce6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+    ref: 955e61e67cf29327cf907432f668df9eec4ca6a2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
     file: '/templates/arch.yml'
   # Fedora container builder template
   - project: 'wayland/ci-templates'
-    ref: adfcd8c318d3398d0547960e45daa34d3b48bce6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+    ref: 955e61e67cf29327cf907432f668df9eec4ca6a2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
     file: '/templates/fedora.yml'
   # Ubuntu container builder template
   - project: 'wayland/ci-templates'
-    ref: adfcd8c318d3398d0547960e45daa34d3b48bce6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+    ref: 955e61e67cf29327cf907432f668df9eec4ca6a2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
     file: '/templates/ubuntu.yml'
 
 stages:
@@ -66,10 +66,10 @@ variables:
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular
   # libinput version
-  FEDORA_TAG: '2019-05-02.0'
-  UBUNTU_TAG: '2019-05-02.0'
-  ARCH_TAG: '2019-04-14.0'
-  FREEBSD_TAG: '2019-03-15.0'
+  FEDORA_TAG: '2019-08-07.0'
+  UBUNTU_TAG: '2019-08-07.0'
+  ARCH_TAG: '2019-08-07.0'
+  FREEBSD_TAG: '2019-08-07.0'
 
   UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
 
@@ -200,13 +200,14 @@ arch:rolling@container-prep:
   <<: *pull_upstream_or_rebuild
   script:
     - export BUILDAH_RUN="buildah run --isolation chroot"
+    - export BUILDAH_COMMIT="buildah commit --format docker"
     - buildcntr=$(buildah from --quiet  myfreeweb/freebsd-cross:latest)
     - $BUILDAH_RUN $buildcntr apk add --no-cache $FREEBSD_BUILD_PKGS
     - $BUILDAH_RUN $buildcntr pkg -r /freebsd update -f
     - $BUILDAH_RUN $buildcntr pkg -r /freebsd install -y $FREEBSD_PKGS
     - buildah config --workingdir /app $buildcntr
     # tag the current container
-    - buildah commit --quiet $buildcntr $FREEBSD_CONTAINER_IMAGE
+    - $BUILDAH_COMMIT $buildcntr $FREEBSD_CONTAINER_IMAGE
     # clean up the working container
     - buildah rm $buildcntr