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

Merge pull request #4513 from nextcloud/pulsejet/heic

Browse source 
feat: enable HEIC+TIFF without Imaginary
This commit is contained in:
Simon L 2024-04-08 05:38:33 +02:00 • committed by GitHub
commit f10bdfd5b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/nextcloud/Dockerfile
View file

@ -44,6 +44,8 @@ RUN set -ex; \
icu-dev \ icu-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick-svg \ imagemagick-svg \
imagemagick-heic \
imagemagick-tiff \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
@ -211,6 +213,8 @@ RUN set -ex; \
bind-tools \ bind-tools \
imagemagick \ imagemagick \
imagemagick-svg \ imagemagick-svg \
imagemagick-heic \
imagemagick-tiff \
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 imagemagick-svg; apk del imagemagick imagemagick-svg imagemagick-heic imagemagick-tiff;
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