From d06b3a7b19d30fa28144abda5f5d616ca3d67edd Mon Sep 17 00:00:00 2001 From: Simon L Date: Thu, 29 Dec 2022 13:43:47 +0100 Subject: [PATCH] revert imagemagick6 change Signed-off-by: Simon L --- Containers/nextcloud/Dockerfile | 3 ++- Containers/nextcloud/start.sh | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index d5a281574007..de95fc8e3d78 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -47,7 +47,7 @@ RUN set -ex; \ ghostscript-dev \ tiff-dev \ zlib-dev \ - imagemagick6-dev \ + imagemagick-dev \ libheif-dev \ librsvg-dev \ libxext-dev \ @@ -213,6 +213,7 @@ RUN set -ex; \ gcompat \ libjpeg \ librsvg \ + libheif \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/Containers/nextcloud/start.sh b/Containers/nextcloud/start.sh index ba03eea7fc7f..2513f52a2ff4 100644 --- a/Containers/nextcloud/start.sh +++ b/Containers/nextcloud/start.sh @@ -43,9 +43,6 @@ if [ -n "$ADDITIONAL_APKS" ]; then if ! [ -f "/additional-apks-are-installed" ]; then read -ra ADDITIONAL_APKS_ARRAY <<< "$ADDITIONAL_APKS" for app in "${ADDITIONAL_APKS_ARRAY[@]}"; do - if [ "$app" = "imagemagick" ]; then - app=imagemagick6 - fi echo "Installing $app via apk..." if ! apk add --no-cache "$app" >/dev/null; then echo "The packet $app was not installed!"