diff --git a/.github/workflows/nextcloud-update.yml b/.github/workflows/nextcloud-update.yml index 0c0db2a9..e1840fa6 100644 --- a/.github/workflows/nextcloud-update.yml +++ b/.github/workflows/nextcloud-update.yml @@ -36,7 +36,7 @@ jobs: | sort -V \ | tail -1 )" - sed -i "s|pecl install memcached.*\;|pecl install memcached-$memcached_version\;|" ./Containers/nextcloud/Dockerfile + sed -i "s|pecl install memcached.* |pecl install memcached-$memcached_version |" ./Containers/nextcloud/Dockerfile # Redis redis_version="$( @@ -47,7 +47,7 @@ jobs: | sort -V \ | tail -1 )" - sed -i "s|pecl install redis.*\;|pecl install redis-$redis_version\;|" ./Containers/nextcloud/Dockerfile + sed -i "s|pecl install redis.* |pecl install redis-$redis_version |" ./Containers/nextcloud/Dockerfile # Imagick imagick_version="$( @@ -60,6 +60,17 @@ jobs: )" sed -i "s|pecl install imagick.*\;|pecl install imagick-$imagick_version\;|" ./Containers/nextcloud/Dockerfile + # Igbinary + igbinary_version="$( + git ls-remote --tags https://github.com/igbinary/igbinary.git \ + | cut -d/ -f3 \ + | grep -viE '[a-z]' \ + | tr -d '^{}' \ + | sort -V \ + | tail -1 + )" + sed -i "s|pecl install igbinary.*\;|pecl install igbinary-$igbinary_version\;|" ./Containers/nextcloud/Dockerfile + # Nextcloud NC_MAJOR="$(grep "ENV NEXTCLOUD_VERSION" ./Containers/nextcloud/Dockerfile | grep -oP '[23][0-9]')" NCVERSION=$(curl -s -m 900 https://download.nextcloud.com/server/releases/ | sed --silent 's/.*href="nextcloud-\([^"]\+\).zip.asc".*/\1/p' | grep "$NC_MAJOR" | sort --version-sort | tail -1) diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index 3e2a62f9..57c82860 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -80,12 +80,10 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install igbinary-3.2.15; \ pecl install APCu-5.1.23; \ - pecl install --configureoptions \ - 'enable-memcached-igbinary="yes"' \ - memcached-3.2.0; \ - pecl install --configureoptions \ - 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \ - redis-6.0.2; \ + pecl install memcached-3.2.0 \ + --configureoptions 'enable-memcached-igbinary="yes"'; \ + pecl install redis-6.0.2 \ + --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ pecl install imagick-3.7.0; \ \ docker-php-ext-enable \