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 #1627 from nextcloud/enh/noid/improve-imagick

Browse source 
move imagick back to the dockerfile
This commit is contained in:
Simon L 2022-12-29 13:07:40 +01:00 • committed by GitHub
commit 6f5b2cc94e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/nextcloud-update.yml vendored
View file

@ -58,7 +58,7 @@ jobs:
| sort -V \ | sort -V \
| tail -1 | tail -1
)" )"
sed -i "s|pecl install imagick.*|pecl install imagick-$imagick_version >/dev/null|" ./Containers/nextcloud/start.sh sed -i "s|pecl install imagick.*\;|pecl install imagick-$imagick_version\;|" ./Containers/nextcloud/Dockerfile
# Nextcloud # Nextcloud
NC_MAJOR="$(grep "ENV NEXTCLOUD_VERSION" ./Containers/nextcloud/Dockerfile | grep -oP '[23][0-9]')" NC_MAJOR="$(grep "ENV NEXTCLOUD_VERSION" ./Containers/nextcloud/Dockerfile | grep -oP '[23][0-9]')"

11
Containers/nextcloud/Dockerfile
View file

@ -41,6 +41,16 @@ RUN set -ex; \
postgresql-dev \ postgresql-dev \
libwebp-dev \ libwebp-dev \
gmp-dev \ gmp-dev \
lcms2-dev \
fontconfig-dev \
freetype-dev \
ghostscript-dev \
tiff-dev \
zlib-dev \
imagemagick-dev \
libheif-dev \
librsvg-dev \
libxext-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@ -62,6 +72,7 @@ RUN set -ex; \
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install memcached-3.2.0; \ pecl install memcached-3.2.0; \
pecl install redis-5.3.7; \ pecl install redis-5.3.7; \
pecl install imagick-3.7.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \

30
Containers/nextcloud/start.sh
View file

@ -57,39 +57,25 @@ if [ -n "$ADDITIONAL_PHP_EXTENSIONS" ]; then
if ! [ -f "/additional-php-extensions-are-installed" ]; then if ! [ -f "/additional-php-extensions-are-installed" ]; then
read -ra ADDITIONAL_PHP_EXTENSIONS_ARRAY <<< "$ADDITIONAL_PHP_EXTENSIONS" read -ra ADDITIONAL_PHP_EXTENSIONS_ARRAY <<< "$ADDITIONAL_PHP_EXTENSIONS"
for app in "${ADDITIONAL_PHP_EXTENSIONS_ARRAY[@]}"; do for app in "${ADDITIONAL_PHP_EXTENSIONS_ARRAY[@]}"; do
if [ "$app" = imagick ]; then
echo "Enabling Imagick..."
if ! docker-php-ext-enable imagick >/dev/null; then
echo "Could not install PHP extension imagick!"
fi
continue
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if [ "$PHP_DEPS_ARE_INSTALLED" != 1 ]; then if [ "$PHP_DEPS_ARE_INSTALLED" != 1 ]; then
echo "Installing PHP build dependencies..." echo "Installing PHP build dependencies..."
if ! apk add --no-cache --virtual .build-deps \ if ! apk add --no-cache --virtual .build-deps \
lcms2-dev \
libheif-dev \
librsvg-dev \
libxext-dev \
libxml2-dev \ libxml2-dev \
lcms2-dev \
fontconfig-dev \
freetype-dev \
ghostscript-dev \
lcms2-dev \
libjpeg-turbo-dev \
libpng-dev \
libtool \
tiff-dev \
zlib-dev \
imagemagick-dev \
autoconf \ autoconf \
$PHPIZE_DEPS >/dev/null; then $PHPIZE_DEPS >/dev/null; then
echo "Could not install build-deps!" echo "Could not install build-deps!"
fi fi
PHP_DEPS_ARE_INSTALLED=1 PHP_DEPS_ARE_INSTALLED=1
fi fi
if [ "$app" = imagick ]; then if [ "$app" = inotify ]; then
echo "Installing Imagick via PECL..."
pecl install imagick-3.7.0 >/dev/null
if ! docker-php-ext-enable imagick >/dev/null; then
echo "Could not install PHP extension imagick!"
fi
elif [ "$app" = inotify ]; then
echo "Installing $app via PECL..." echo "Installing $app via PECL..."
pecl install "$app" >/dev/null pecl install "$app" >/dev/null
if ! docker-php-ext-enable "$app" >/dev/null; then if ! docker-php-ext-enable "$app" >/dev/null; then