mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

docker: fedora: Update to fedora 29

Browse source
This commit is contained in:
Thibault Saunier 2018-08-07 19:27:40 -04:00 committed by Jordan Petridis
parent fa20357221
commit f1ea83a297
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
2 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
docker/build-base-images/Dockerfile-fedora
View file

@ -1,4 +1,4 @@
FROM gstreamer/base-fedora:latest
FROM registry.freedesktop.org/thiblahute/gst-ci/fedora-runtime
# Add rpmfusion repositories and install all build dependencies of GStreamer
RUN dnf builddep -y \
@ -14,10 +14,9 @@ RUN dnf builddep -y \
gstreamer1-plugins-bad-freeworld \
gstreamer1-libav \
gstreamer1-rtsp-server \
python3-gstreamer1 \
&& \
rpm -e \
gstreamer1 \
gstreamer1-plugins-base \
gstreamer1-devel \
gstreamer1-plugins-base-devel \
&& \
@ -34,35 +33,10 @@ RUN dnf builddep -y \
redhat-rpm-config \
xorg-x11-server-Xvfb \
xorg-x11-server-utils \
wget \
&& \
wget \
meson && \
dnf clean all
# Clone copies of all repositories to avoid extra downloads
RUN mkdir /repositories && \
cd /repositories && \
for i in orc \
common \
gstreamer \
gst-plugins-base \
gst-plugins-good \
gst-plugins-bad \
gst-plugins-ugly \
gst-libav \
gst-build \
gst-devtools\
gst-docs \
gst-editing-services \
gst-omx \
gst-python \
gst-rtsp-server; \
do \
git clone --mirror https://anongit.freedesktop.org/git/gstreamer/$i; \
done
# Install repo tool
RUN wget -nd https://storage.googleapis.com/git-repo-downloads/repo -O /usr/bin/repo && chmod a+x /usr/bin/repo
# Add the user UID:1000, GID:1000, home at /gstbuild
RUN groupadd -r gstbuild -g 1000 && useradd -u 1000 -r -g gstbuild -m -d /gstbuild -s /sbin/nologin -c "Gstbuild user" gstbuild && \
chmod 755 /gstbuild

12
docker/runtime-images/Dockerfile-fedora
View file

@ -1,12 +1,12 @@
FROM fedora:26
FROM fedora:29
# Add rpmfusion repositories and install all build dependencies of GStreamer
# and then remove the gst packages themselves
RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf && \
dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-26.noarch.rpm \
http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-26.noarch.rpm && \
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-26 && \
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-26 && \
dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-29.noarch.rpm \
http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-29.noarch.rpm && \
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-29 && \
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-29 && \
dnf upgrade -y && \
dnf install -y \
dnf-plugins-core \
@ -31,8 +31,6 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf && \
gstreamer1-rtsp-server \
&& \
rpm -e \
gstreamer1 \
gstreamer1-plugins-base \
gstreamer1-plugins-good \
gstreamer1-plugins-good-extras \
gstreamer1-plugins-ugly \