diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-11-17 19:04:07 +0200 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2020-11-17 19:05:01 +0200 |
| commit | 7220e799acbdb99f1dddb8d900c5ae2da4b12164 (patch) | |
| tree | 493f956fe7ede6afdd63946f9962a23a5a4c8007 | |
| parent | ec029aeec20910f8bd4031d60b4368191622d0ca (diff) | |
docker/fedora: make it build again1.16
* Fedora has nuked f29 images from its registry so use dockerhub
* Clone gst-build with the 1.16 branch
* Upgrade meson to 0.56.0 while we are at it
| -rw-r--r-- | docker/fedora/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/fedora/prepare.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 4191110..0e80c32 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:29 +FROM fedora:29 COPY prepare.sh cleanup.sh /root/ diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index 6b8aaed..41548ea 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -151,7 +151,7 @@ dnf debuginfo-install -y gtk3 \ zip \ zlib -pip3 install meson==0.50.1 git+https://github.com/axiros/terminal_markdown_viewer +pip3 install meson==0.56.0 git+https://github.com/axiros/terminal_markdown_viewer # Install the dependencies of gstreamer dnf builddep -y gstreamer1 \ @@ -178,7 +178,7 @@ dnf remove -y "gstreamer1*devel" dnf remove -y "qt5-qtbase-devel" # get gst-build and make all subprojects available -git clone git://anongit.freedesktop.org/gstreamer/gst-build /gst-build/ +git clone -b 1.16 https://gitlab.freedesktop.org/gstreamer/gst-build.git cd /gst-build meson subprojects download |