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

Merge pull request #4168 from nextcloud/enh/noid/fix-imagick

Browse source 
fix imagick not having svg support
This commit is contained in:
Simon L 2024-02-02 15:09:51 +01:00 • committed by GitHub
commit 5cbbe1bab8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/nextcloud/Dockerfile
View file

@ -38,6 +38,7 @@ RUN set -ex; \
gmp-dev \ gmp-dev \
icu-dev \ icu-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick-svg \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
@ -192,6 +193,7 @@ RUN set -ex; \
nodejs \ nodejs \
bind-tools \ bind-tools \
imagemagick \ imagemagick \
imagemagick-svg \
coreutils; \ coreutils; \
\ \
grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \ grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \

2
Containers/nextcloud/start.sh
View file

@ -56,7 +56,7 @@ if [ -n "$ADDITIONAL_APKS" ]; then
if ! [ -f "/additional-apks-are-installed" ]; then if ! [ -f "/additional-apks-are-installed" ]; then
# Allow to disable imagemagick without having to download it each time # Allow to disable imagemagick without having to download it each time
if ! echo "$ADDITIONAL_APKS" | grep -q imagemagick; then if ! echo "$ADDITIONAL_APKS" | grep -q imagemagick; then
apk del imagemagick; apk del imagemagick imagemagick-svg;
fi fi
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