diff options
| author | Christoph Reiter <creiter@src.gnome.org> | 2019-04-30 15:15:47 +0200 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2019-05-10 15:48:33 +0200 |
| commit | 24fcfa91b14ec1ed5509691e1665d5fec3e28089 (patch) | |
| tree | 500a56024b7aa2954dae689f9b3e580257d593f8 /.gitlab-ci | |
| parent | 4f0ea69e9b266123671e6c2070e5c19ef7a0e3a6 (diff) | |
| download | gtk+-24fcfa91b14ec1ed5509691e1665d5fec3e28089.tar.gz | |
CI: update docker image to fedora 30
So we don't have to build glib as a subproject.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 8 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 57b1983fda..a9c011d456 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 RUN dnf -y install \ hicolor-icon-theme \ @@ -11,6 +11,7 @@ RUN dnf -y install \ ccache \ colord-devel \ cups-devel \ + dbus-daemon \ dejavu-sans-mono-fonts \ desktop-file-utils \ elfutils-libelf-devel \ @@ -59,6 +60,7 @@ RUN dnf -y install \ pango-devel \ pcre-devel \ python3 \ + python3-jinja2 \ python3-pip \ python3-wheel \ redhat-rpm-config \ @@ -71,9 +73,7 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all -RUN pip3 install meson==0.50.0 - -RUN pip3 install jinja2 +RUN pip3 install meson==0.50.1 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index bcc8d7d076..b0857777ee 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gtk/master:v4" +TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |