eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

revert imagemagick6 change

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-29 13:43:47 +01:00
parent 7a6f350248
commit d06b3a7b19
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Containers/nextcloud/Dockerfile
View file

@ -47,7 +47,7 @@ RUN set -ex; \
ghostscript-dev \ ghostscript-dev \
tiff-dev \ tiff-dev \
zlib-dev \ zlib-dev \
imagemagick6-dev \ imagemagick-dev \
libheif-dev \ libheif-dev \
librsvg-dev \ librsvg-dev \
libxext-dev \ libxext-dev \
@ -213,6 +213,7 @@ RUN set -ex; \
gcompat \ gcompat \
libjpeg \ libjpeg \
librsvg \ librsvg \
libheif \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

3
Containers/nextcloud/start.sh
View file

@ -43,9 +43,6 @@ if [ -n "$ADDITIONAL_APKS" ]; then
if ! [ -f "/additional-apks-are-installed" ]; then if ! [ -f "/additional-apks-are-installed" ]; then
read -ra ADDITIONAL_APKS_ARRAY <<< "$ADDITIONAL_APKS" read -ra ADDITIONAL_APKS_ARRAY <<< "$ADDITIONAL_APKS"
for app in "${ADDITIONAL_APKS_ARRAY[@]}"; do for app in "${ADDITIONAL_APKS_ARRAY[@]}"; do
if [ "$app" = "imagemagick" ]; then
app=imagemagick6
fi
echo "Installing $app via apk..." echo "Installing $app via apk..."
if ! apk add --no-cache "$app" >/dev/null; then if ! apk add --no-cache "$app" >/dev/null; then
echo "The packet $app was not installed!" echo "The packet $app was not installed!"