diff --git a/static/build_files/docker/client/Dockerfile b/static/build_files/docker/client/Dockerfile index ee07a344..215a10e5 100644 --- a/static/build_files/docker/client/Dockerfile +++ b/static/build_files/docker/client/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.16 ARG UID ARG GID @@ -7,11 +7,11 @@ HEALTHCHECK --interval=20s --timeout=10s --retries=3 --start-period=30s CMD ! su ENTRYPOINT ["/bin/sh", "/opt/hydrus/static/build_files/docker/client/entrypoint.sh"] LABEL git="https://github.com/hydrusnetwork/hydrus" -RUN apk --no-cache add fvwm x11vnc xvfb supervisor opencv mpv mpv-libs ffmpeg jq libheif \ +RUN apk --no-cache add fvwm x11vnc xvfb supervisor opencv mpv mpv-libs ffmpeg jq \ openssl nodejs patch font-noto font-noto-emoji font-noto-cjk \ py3-pyside6 py3-beautifulsoup4 py3-pillow py3-numpy py3-openssl py3-cryptography py3-pip py3-opencv py3-lxml py3-chardet \ - py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 py3-html5lib py3-dateutil py3-qtpy py3-mpv py3-service_identity -RUN pip install Send2Trash cloudscraper pyparsing cbor2 Pympler pillow-heif dateparser + py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 py3-html5lib py3-dateutil +RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing cbor2 Pympler RUN set -xe \ && mkdir -p /opt/hydrus \ diff --git a/static/build_files/docker/server/Dockerfile b/static/build_files/docker/server/Dockerfile index 774a43b7..e20e4823 100644 --- a/static/build_files/docker/server/Dockerfile +++ b/static/build_files/docker/server/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.18 +FROM alpine:3.16 ARG UID ARG GID -RUN apk --no-cache add py3-psutil py3-requests py3-twisted py3-yaml py3-lz4 ffmpeg py3-pillow py3-numpy py3-openssl py3-cryptography py3-service_identity py3-opencv py3-pip py3-twisted openssl su-exec -RUN pip install Send2Trash +RUN apk --no-cache add py3-psutil py3-requests py3-twisted py3-yaml py3-lz4 ffmpeg py3-pillow py3-numpy py3-openssl py3-cryptography py3-service_identity py3-opencv py3-pip openssl su-exec +RUN pip install Send2Trash twisted RUN set -xe \ && mkdir -p /opt/hydrus \