Merge branch 'add-flask' into 'master'

Add Flask to the Docker images

See merge request openlp/runners!8
This commit is contained in:
Raoul Snyman 2019-10-30 16:37:18 +00:00
commit c3b91a400e
4 changed files with 6 additions and 6 deletions

View File

@ -5,6 +5,6 @@ RUN pacman -Syyu --noconfirm git python qt5-multimedia qt5-svg qt5-webengine qt5
python-dbus python-sqlalchemy python-alembic python-chardet python-lxml python-pyenchant \
python-beautifulsoup4 python-mako python-pytest python-pytest-cov python-websockets \
python-webob python-waitress python-requests python-pymediainfo python-qtawesome \
python-opengl python-appdirs python-zeroconf python-pip flake8 mediainfo mupdf-tools \
xorg-server-xvfb pyalpm fakeroot patch awk
python-opengl python-appdirs python-zeroconf python-flask python-pip flake8 mediainfo \
mupdf-tools xorg-server-xvfb pyalpm fakeroot patch awk
RUN pip install python-vlc pysword

View File

@ -7,6 +7,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
python3-flake8 flake8 mediainfo mupdf-tools xvfb
python3-flake8 python3-flask flake8 mediainfo mupdf-tools xvfb
ADD fixpaths.py /usr/bin/fixpaths
RUN chmod a+x /usr/bin/fixpaths

View File

@ -5,5 +5,5 @@ RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-re
RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python3-alembic python3-beautifulsoup4 \
python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest python3-websockets \
python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \
python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 mediainfo patch \
xorg-x11-server-Xvfb ghostscript mupdf
python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \
mediainfo patch xorg-x11-server-Xvfb ghostscript mupdf

View File

@ -7,4 +7,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
python3-flake8 flake8 mediainfo mupdf-tools xvfb
python3-flake8 python3-flask flake8 mediainfo mupdf-tools xvfb