summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2019-12-11 10:59:03 +0100
committerBenjamin Berg <bberg@redhat.com>2019-12-11 12:56:28 +0100
commit2e97ba316dcfe8554f17e3fc88a82cbe0b79ec44 (patch)
tree5a41e76efefe10257512870c07daa04e5cceb622 /.gitlab-ci
parent7186d090858c025e88f51bb4a6450bb277ee5e84 (diff)
downloadmutter-2e97ba316dcfe8554f17e3fc88a82cbe0b79ec44.tar.gz
ci: Change instructions to use podman
Podman can also be used to create the image. The only thing to keep in mind with podman is to add --format docker, so that the image will be compatible with all CI runners. https://gitlab.gnome.org/GNOME/mutter/merge_requests/966
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 6d2548c18..9accc9756 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,8 +1,8 @@
# Rebuild and push with
#
# cd .gitlab-ci/
-# docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 .
-# docker push registry.gitlab.gnome.org/gnome/mutter/master:v3
+# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 .
+# podman push registry.gitlab.gnome.org/gnome/mutter/master:v3
#
FROM fedora:31