diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-10 17:05:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-10 17:05:44 +0000 |
| commit | c5071de2aeeb45f16192a00503350544e342bf4f (patch) | |
| tree | 85e0802e6511812879ed623f087699842e466cc8 /.gitlab-ci/fedora.Dockerfile | |
| parent | 0916383e8201aa6622eee496a25af99845d53b72 (diff) | |
| parent | 7b10afbde9278ba153609f4567179b9309f70090 (diff) | |
| download | pango-c5071de2aeeb45f16192a00503350544e342bf4f.tar.gz | |
Merge branch 'bump-ci-image' into 'main'
ci: Rebase the image to Fedora 34
See merge request GNOME/pango!542
Diffstat (limited to '.gitlab-ci/fedora.Dockerfile')
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index e905deee..a7600b46 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:34 RUN dnf -y install \ abattis-cantarell-fonts \ @@ -33,6 +33,7 @@ RUN dnf -y install \ libubsan \ libXft-devel \ llvm \ + meson \ ninja-build \ python3 \ python3-jinja2 \ @@ -46,8 +47,6 @@ RUN dnf -y install \ thai-scalable-waree-fonts \ && dnf clean all -RUN pip3 install meson==0.56 - ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN useradd -u $HOST_USER_ID -ms /bin/bash user |