diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-02-12 12:29:47 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-02-12 14:45:44 +0100 |
| commit | 7ed5785b883a83746a5d7b003cc2f6a8fa9a8ecf (patch) | |
| tree | 76c0b3df1018106ae69f93d39657e8deb3ba539b | |
| parent | 0114b4ebb0e00390a788338fa3fe6b8b8c1036b5 (diff) | |
| download | gvfs-7ed5785b883a83746a5d7b003cc2f6a8fa9a8ecf.tar.gz | |
ci: Use Buildah instead of Docker to generate images
The GNOME runners are no more privileged and thus it is not possible to
use Docker from the pipeline. Let's use Buildah instead Docker to fix
the image generation.
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 807ead66..a7ffbba6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ fedora: - image: registry.gitlab.gnome.org/gnome/gvfs:latest + image: + name: registry.gitlab.gnome.org/gnome/gvfs:latest + entrypoint: ["/bin/sh", "-c"] tags: - x86_64 script: @@ -10,18 +12,20 @@ fedora: update-image: variables: - DOCKER_TLS_CERTDIR: "" - image: docker:latest - tags: - - privileged - services: - - docker:dind + STORAGE_DRIVER: vfs + BUILDAH_FORMAT: docker + BUILDAH_ISOLATION: chroot + image: registry.fedoraproject.org/fedora:33 script: - - docker build --tag $CI_REGISTRY_IMAGE .gitlab-ci/ - - docker tag $CI_REGISTRY_IMAGE "$CI_REGISTRY_IMAGE:v$CI_JOB_ID" - - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD - - docker push $CI_REGISTRY_IMAGE + - dnf install -y buildah runc + - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf + - buildah bud --tag $CI_REGISTRY_IMAGE -f .gitlab-ci/Dockerfile + - buildah tag $CI_REGISTRY_IMAGE "$CI_REGISTRY_IMAGE:v$CI_JOB_ID" + - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - buildah push $CI_REGISTRY_IMAGE + - buildah push "$CI_REGISTRY_IMAGE:v$CI_JOB_ID" when: manual only: variables: - $CI_PROJECT_NAMESPACE == "GNOME" + |