From 6ccc6f64ad0294299c94aac4863d89d4aa643929 Mon Sep 17 00:00:00 2001
From: Suika <2320837+Suika@users.noreply.github.com>
Date: Wed, 15 Nov 2023 20:56:37 +0100
Subject: [PATCH] Docker update (#1477)

* Docker Client: alpine 3.18, heif, mpv and qtpy now native packages

* Docker Server: alpine 3.18, native twisted package

* Docker Client: Add service_identity and dateparser
---
 static/build_files/docker/client/Dockerfile | 8 ++++----
 static/build_files/docker/server/Dockerfile | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/static/build_files/docker/client/Dockerfile b/static/build_files/docker/client/Dockerfile
index 215a10e5..ee07a344 100644
--- a/static/build_files/docker/client/Dockerfile
+++ b/static/build_files/docker/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 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 \
+RUN apk --no-cache add fvwm x11vnc xvfb supervisor opencv mpv mpv-libs ffmpeg jq libheif \
  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
-RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing cbor2 Pympler
+ 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
 
 RUN set -xe \
     && mkdir -p /opt/hydrus \
diff --git a/static/build_files/docker/server/Dockerfile b/static/build_files/docker/server/Dockerfile
index e20e4823..774a43b7 100644
--- a/static/build_files/docker/server/Dockerfile
+++ b/static/build_files/docker/server/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 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 openssl su-exec
-RUN pip install Send2Trash twisted
+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 set -xe \
     && mkdir -p /opt/hydrus \