diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2019-10-29 00:50:07 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2019-10-29 02:11:02 +0100 |
| commit | 40a76590dd821cc10af0ab2621f2f4b84a9a861e (patch) | |
| tree | 7c7bc9f95cc6d91522aecec19ae1425de038c88d /.gitlab-ci | |
| parent | f2b3dd318f1165849b45a86251724939b100ef7d (diff) | |
| download | mutter-40a76590dd821cc10af0ab2621f2f4b84a9a861e.tar.gz | |
ci: Update docker image to v3
It's this time of the cycle again: Rebase the docker image to the
upcoming Fedora release, so we can drop a fair bit of the custom
dependencies that have piled up.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/894
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 2acacc1ac..653298976 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,39 +1,28 @@ # Rebuild and push with # # cd .gitlab-ci/ -# docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v2 . -# docker push registry.gitlab.gnome.org/gnome/mutter/master:v2 +# docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 . +# docker push registry.gitlab.gnome.org/gnome/mutter/master:v3 # -FROM fedora:30 +FROM fedora:31 RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(builddep)' && \ dnf install -y 'dnf-command(copr)' && \ dnf copr enable -y fmuellner/gnome-shell-ci && \ - dnf copr enable -y jadahl/mutter-ci && \ - dnf copr enable -y hergertme/sysprof-3 && \ dnf -y update && dnf -y upgrade && \ dnf builddep -y mutter && \ - # Until Fedora catches up with meson build-deps - dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland graphene-devel && \ - - # Until Fedora catches up with mesa bug fixes - dnf upgrade -y mesa-dri-drivers mesa-libEGL && \ + # Until Fedora catches up with new build-deps + dnf install -y 'pkgconfig(graphene-gobject-1.0)' 'pkgconfig(sysprof-capture-3)' && \ # For running unit tests dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \ - dnf install -y sysprof-devel && \ - - dnf install -y intltool redhat-rpm-config make && \ - # GNOME Shell dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \ - # New dep this cycle - dnf install -y 'pkgconfig(gnome-autoar-0)' && \ dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \ dnf remove -y --noautoremove mutter mutter-devel && \ |