diff options
| author | Ben Sturmfels <ben@sturm.com.au> | 2021-03-09 09:54:48 +1100 |
|---|---|---|
| committer | Ben Sturmfels <ben@sturm.com.au> | 2021-03-09 14:47:40 +1100 |
| commit | 7e2a2ecfdcf0783736465a62d81d8c087acb6703 (patch) | |
| tree | 6c84de80f83af41a1aacedef873dc2b471012820 /Dockerfile-fedora-python3-sqlite | |
| parent | 4f53c4b17c1c92a4a222ab61732e1c5489ff2639 (diff) | |
| download | mediagoblin-7e2a2ecfdcf0783736465a62d81d8c087acb6703.tar.lz mediagoblin-7e2a2ecfdcf0783736465a62d81d8c087acb6703.tar.xz mediagoblin-7e2a2ecfdcf0783736465a62d81d8c087acb6703.zip | |
Extend Fedora Dockerfile, add sourcehut builds for Debian and Fedora.
Previously had partial docs for Fedora 31. This updates to Fedora 33, adds
support for audio and video and adds dependencies to allow the test suite to run
to completion.
Diffstat (limited to 'Dockerfile-fedora-python3-sqlite')
| -rw-r--r-- | Dockerfile-fedora-python3-sqlite | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/Dockerfile-fedora-python3-sqlite b/Dockerfile-fedora-python3-sqlite index 287ebc9c..72f2874d 100644 --- a/Dockerfile-fedora-python3-sqlite +++ b/Dockerfile-fedora-python3-sqlite @@ -8,7 +8,7 @@ # # See Dockerfile-debian-python3-sqlite for details. -FROM fedora:31 +FROM fedora:33 RUN dnf -y install \ automake \ @@ -39,22 +39,23 @@ python3-sphinx \ # python3-sphinxcontrib.websupport \ python3-webtest \ # Fedora only -which +which \ +# To build waitress on Fedora 33 (not required for 31) +libffi-devel -# RUN dnf -y install \ -# gstreamer1.0-libav \ -# gstreamer1.0-plugins-bad \ -# gstreamer1.0-plugins-base \ -# gstreamer1.0-plugins-good \ -# gstreamer1.0-plugins-ugly \ -# python3-gst-1.0 \ -# python3-numpy +RUN dnf -y install \ +gstreamer1-plugins-base \ +gstreamer1-plugins-bad-free \ +gstreamer1-plugins-good \ +gstreamer1-plugins-ugly-free \ +python3-numpy -# RUN apt-get install -y \ -# gir1.2-gst-plugins-base-1.0 \ -# gir1.2-gstreamer-1.0 \ -# gstreamer1.0-tools \ -# python3-gi +RUN dnf search gst + +RUN dnf -y install \ +python3-gobject \ +python3-gstreamer1 \ +gstreamer1-plugin-openh264 # RUN apt-get install -y \ # poppler-utils @@ -72,7 +73,7 @@ RUN chown root:www-data /var/www USER www-data -RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git --branch master . +RUN git clone --depth=1 https://git.sr.ht/~mediagoblin/mediagoblin --branch ci . RUN git show --oneline --no-patch RUN ./bootstrap.sh @@ -81,8 +82,8 @@ RUN make RUN ./bin/python -m pytest ./mediagoblin/tests --boxed -# RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini -# RUN echo '[[mediagoblin.media_types.video]]' >> mediagoblin.ini +RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini +RUN echo '[[mediagoblin.media_types.video]]' >> mediagoblin.ini # Fedora only RUN ./bin/pip install certifi @@ -90,6 +91,12 @@ RUN ./bin/gmg dbupdate RUN ./bin/gmg adduser --username admin --password a --email admin@example.com RUN ./bin/gmg makeadmin admin +# Without the following we get "ModuleNotFoundError: No module named +# 'paste.script'" when running ./lazyserver.sh. Not sure why as PasteScript is +# in the setup.py requirements. Before this we have Paste==3.4.0; after we have +# Paste==3.5.0. +RUN ./bin/pip install PasteScript --force-reinstall + EXPOSE 6543/tcp CMD ["./lazyserver.sh", "--server-name=broadcast"] |