From 9ec52806c47257d72d586d4fd403079b81ac08ff Mon Sep 17 00:00:00 2001 From: krateng Date: Fri, 31 Dec 2021 21:27:22 +0100 Subject: [PATCH] Made image resizing optional again to keep Docker image size down --- Dockerfile | 1 - install/dependencies_basic.txt | 1 + install/dependencies_build.txt | 3 ++- install/dependencies_run.txt | 4 ---- install/dependencies_run_opt.txt | 1 + install/install_dependencies.sh | 4 +++- maloja/server.py | 3 ++- pyproject.toml | 2 +- requirements.txt | 1 - requirements_extra.txt | 1 + 10 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 install/dependencies_basic.txt create mode 100644 install/dependencies_run_opt.txt create mode 100644 requirements_extra.txt diff --git a/Dockerfile b/Dockerfile index cd77c22..2c8a278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,6 @@ RUN \ # expected behavior for a default setup is for maloja to "just work" ENV MALOJA_SKIP_SETUP=yes -ENV MAGICK_HOME=/usr EXPOSE 42010 # use exec form for better signal handling https://docs.docker.com/engine/reference/builder/#entrypoint diff --git a/install/dependencies_basic.txt b/install/dependencies_basic.txt new file mode 100644 index 0000000..273cd54 --- /dev/null +++ b/install/dependencies_basic.txt @@ -0,0 +1 @@ +python3 diff --git a/install/dependencies_build.txt b/install/dependencies_build.txt index 21e034f..e72a452 100644 --- a/install/dependencies_build.txt +++ b/install/dependencies_build.txt @@ -1,6 +1,7 @@ gcc libxml2-dev libxslt-dev -py3-pip +libffi-dev libc-dev +py3-pip linux-headers diff --git a/install/dependencies_run.txt b/install/dependencies_run.txt index 55a1079..0883ff0 100644 --- a/install/dependencies_run.txt +++ b/install/dependencies_run.txt @@ -1,5 +1 @@ -python3 -python3-dev -imagemagick -imagemagick-dev tzdata diff --git a/install/dependencies_run_opt.txt b/install/dependencies_run_opt.txt new file mode 100644 index 0000000..c2850f6 --- /dev/null +++ b/install/dependencies_run_opt.txt @@ -0,0 +1 @@ +vips diff --git a/install/install_dependencies.sh b/install/install_dependencies.sh index 2117b32..bbdc570 100644 --- a/install/install_dependencies.sh +++ b/install/install_dependencies.sh @@ -1,2 +1,4 @@ -sed 's/#.*//' ./install/dependencies_run.txt | xargs apk add +sed 's/#.*//' ./install/dependencies_basic.txt | xargs apk add sed 's/#.*//' ./install/dependencies_build.txt | xargs apk add +sed 's/#.*//' ./install/dependencies_run.txt | xargs apk add +sed 's/#.*//' ./install/dependencies_run_opt.txt | xargs apk add diff --git a/maloja/server.py b/maloja/server.py index cf1333b..015596e 100644 --- a/maloja/server.py +++ b/maloja/server.py @@ -6,7 +6,7 @@ from threading import Thread import setproctitle import pkg_resources from css_html_js_minify import html_minify, css_minify -from pyvips import Image + # server stuff from bottle import Bottle, static_file, request, response, FormsDict, redirect, BaseRequest, abort @@ -175,6 +175,7 @@ def static_image(pth): response = static_file(small_pth,root=data_dir['images']()) else: try: + from pyvips import Image thumb = Image.thumbnail(data_dir['images'](pth),300) thumb.webpsave(data_dir['images'](small_pth)) response = static_file(small_pth,root=data_dir['images']()) diff --git a/pyproject.toml b/pyproject.toml index 4abc0da..5a22d78 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ "doreah>=1.7.2, <2", "nimrodel>=0.7.0", "setproctitle>=1.1.10", - "wand>=0.5.4", + #"pyvips>=2.1.16", "jinja2>=2.11", "lru-dict>=1.1.6", "css_html_js_minify>=2.5.5", diff --git a/requirements.txt b/requirements.txt index cce2176..ffc101c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ waitress>=1.3 doreah>=1.7.2 nimrodel>=0.7.0 setproctitle>=1.1.10 -wand>=0.5.4 jinja2>=2.11 lru-dict>=1.1.6 css_html_js_minify>=2.5.5 diff --git a/requirements_extra.txt b/requirements_extra.txt new file mode 100644 index 0000000..82d08f0 --- /dev/null +++ b/requirements_extra.txt @@ -0,0 +1 @@ +pyvips>=2.1