[nautilus/wip/oholy/ci-buildah: 1/2] ci: Use buildah instead of docker
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/ci-buildah: 1/2] ci: Use buildah instead of docker
- Date: Thu, 19 Nov 2020 09:50:51 +0000 (UTC)
commit 3bdf80285e547a05c14962ea7570b1afc9bf62a7
Author: Ondrej Holy <oholy redhat com>
Date: Thu Nov 19 10:21:15 2020 +0100
ci: Use buildah instead of docker
.gitlab-ci.yml | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24a397f64..327c3c489 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ flatpak devel:
FLATPAK_MODULE: "nautilus"
RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
APP_ID: "org.gnome.NautilusDevel"
+ when: manual
nightly:
extends: '.publish_nightly'
@@ -32,9 +33,10 @@ fedora rawhide:
- meson _build .
- cd _build
- ninja test
- only:
- - web
- - master
+ #only:
+ #- web
+ #- master
+ when: manual
allow_failure: true
flatpak master:
@@ -85,25 +87,26 @@ style check:
- gcc data/lineup-parameters.c `pkg-config --cflags --libs gio-2.0 gio-unix-2.0` -o
data/lineup-parameters
- LANG=C.utf8 data/run-uncrustify.sh
- git diff --exit-code | tee uncrustify.diff
+ when: manual
update image:
variables:
- DOCKER_TLS_CERTDIR: ""
- image: docker:latest
+ STORAGE_DRIVER: vfs
+ BUILDAH_FORMAT: docker
+ BUILDAH_ISOLATION: chroot
+ image: registry.fedoraproject.org/fedora:33
stage: image
- tags:
- - privileged
- services:
- - docker:dind
script:
- - docker build --tag $CI_REGISTRY_IMAGE .gitlab/
- - 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
- when: manual
- only:
- - web
- - master
+ - dnf install -y buildah runc
+ - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
+ - buildah bud --tag $CI_REGISTRY_IMAGE -f .gitlab/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
+ #when: manual
+ #only:
+ #- web
+ #- master
except:
variables:
- $CI_PROJECT_NAMESPACE != "GNOME"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]