[gnome-runtime-images] ci: edit storage.conf just before building the container



commit 0ae21948af2ab7cc8297d02c7edd62b470f45ea1
Author: Jordan Petridis <jpetridis gnome org>
Date:   Wed Aug 21 15:55:33 2019 +0300

    ci: edit storage.conf just before building the container

 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8e6977..985e094 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,14 +13,15 @@ stages:
 # Expects ${DOCKERFILE} variable which should be the path to the Dockerfile.
 .build_template:
     script:
-        # Newer versions of podman/buildah try to set overlayfs mount options when
-        # using the vfs driver, and this causes errors.
-        -  sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
-
         # For debugging
         - echo ${DOCKERFILE} / ${DOCKERIMAGE}
         - dnf install -y buildah podman
         - buildah login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
+
+        # Newer versions of podman/buildah try to set overlayfs mount options when
+        # using the vfs driver, and this causes errors.
+        - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
+
         - buildah bud --format=docker --pull -f ${DOCKERFILE} -t ${DOCKERIMAGE} .
         - buildah push ${DOCKERIMAGE}
     after_script:


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