aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-06-15 15:54:47 +02:00
Code Activity

Add workaround and update php to 8.3

Browse source 
Signed-off-by: HowRuck <ertus123123@gmail.com>
This commit is contained in:
HowRuck 2024-12-16 11:26:57 +01:00
parent 035003969a
commit 7bc9f22463
No known key found for this signature in database
GPG key ID: A951D20CFB8BFE5C
13 changed files with 230 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Dockerfile-debian.template
View file

@ -1,5 +1,8 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%%
# Define the commit hash for imagick as a variable
ARG IMAGICK_COMMIT_HASH=28f27044e435a2b203e32675e942eb8de620ee58
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
\
@ -65,9 +68,22 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-%%APCU_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \
pecl install -o redis-%%REDIS_VERSION%%; \
# pecl install imagick-%%IMAGICK_VERSION%%; \
# Begin workaround ->
# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
apt-get install -y --no-install-recommends git libmagickwand-dev && \
git clone https://github.com/imagick/imagick.git --depth 1 /tmp/imagick && \
cd /tmp/imagick && \
git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
git checkout ${IMAGICK_COMMIT_HASH} && \
sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7f/" php_imagick.h && \
phpize && ./configure && make && make install && \
cd && rm -r /tmp/imagick; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
# <- End workaround
\
docker-php-ext-enable \
apcu \
@ -155,4 +171,4 @@ COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/
ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"]
CMD ["%%CMD%%"]