aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-21 03:06:08 +02:00
Code Activity

Clenaup GMP extension installation

Browse source 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
J0WI 2023-03-21 19:01:21 +01:00
parent bad1e98c8e
commit 377b51437d
9 changed files with 75 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
24/apache/Dockerfile
View file

@ -6,11 +6,11 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
rsync \
bzip2 \
busybox-static \ busybox-static \
bzip2 \
libldap-common \ libldap-common \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
rsync \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
@ -30,18 +30,18 @@ RUN set -ex; \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libevent-dev \ libevent-dev \
libfreetype6-dev \ libfreetype6-dev \
libgmp-dev \
libicu-dev \ libicu-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
libwebp-dev \ libwebp-dev \
libgmp-dev \ libxml2-dev \
libzip-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,27 +51,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

17
24/fpm-alpine/Dockerfile
View file

@ -5,8 +5,8 @@ FROM php:8.0-fpm-alpine3.16
RUN set -ex; \ RUN set -ex; \
\ \
apk add --no-cache \ apk add --no-cache \
rsync \
imagemagick \ imagemagick \
rsync \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ rm /var/spool/cron/crontabs/root; \
@ -20,20 +20,20 @@ RUN set -ex; \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
autoconf \ autoconf \
freetype-dev \ freetype-dev \
gmp-dev \
icu-dev \ icu-dev \
imagemagick-dev \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \
libwebp-dev \
libxml2-dev \ libxml2-dev \
libzip-dev \ libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
libwebp-dev \
gmp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@ -42,27 +42,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

19
24/fpm/Dockerfile
View file

@ -6,11 +6,11 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
rsync \
bzip2 \
busybox-static \ busybox-static \
bzip2 \
libldap-common \ libldap-common \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
rsync \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
@ -30,18 +30,18 @@ RUN set -ex; \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libevent-dev \ libevent-dev \
libfreetype6-dev \ libfreetype6-dev \
libgmp-dev \
libicu-dev \ libicu-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
libwebp-dev \ libwebp-dev \
libgmp-dev \ libxml2-dev \
libzip-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,27 +51,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

19
25/apache/Dockerfile
View file

@ -6,11 +6,11 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
rsync \
bzip2 \
busybox-static \ busybox-static \
bzip2 \
libldap-common \ libldap-common \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
rsync \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
@ -30,18 +30,18 @@ RUN set -ex; \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libevent-dev \ libevent-dev \
libfreetype6-dev \ libfreetype6-dev \
libgmp-dev \
libicu-dev \ libicu-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
libwebp-dev \ libwebp-dev \
libgmp-dev \ libxml2-dev \
libzip-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,27 +51,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

17
25/fpm-alpine/Dockerfile
View file

@ -5,8 +5,8 @@ FROM php:8.1-fpm-alpine3.16
RUN set -ex; \ RUN set -ex; \
\ \
apk add --no-cache \ apk add --no-cache \
rsync \
imagemagick \ imagemagick \
rsync \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ rm /var/spool/cron/crontabs/root; \
@ -20,20 +20,20 @@ RUN set -ex; \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
autoconf \ autoconf \
freetype-dev \ freetype-dev \
gmp-dev \
icu-dev \ icu-dev \
imagemagick-dev \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \
libwebp-dev \
libxml2-dev \ libxml2-dev \
libzip-dev \ libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
libwebp-dev \
gmp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@ -42,27 +42,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

19
25/fpm/Dockerfile
View file

@ -6,11 +6,11 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
rsync \
bzip2 \
busybox-static \ busybox-static \
bzip2 \
libldap-common \ libldap-common \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
rsync \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
@ -30,18 +30,18 @@ RUN set -ex; \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libevent-dev \ libevent-dev \
libfreetype6-dev \ libfreetype6-dev \
libgmp-dev \
libicu-dev \ libicu-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
libwebp-dev \ libwebp-dev \
libgmp-dev \ libxml2-dev \
libzip-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -51,27 +51,28 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \ pecl install APCu-5.1.22; \
pecl install imagick-3.7.0; \
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 \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

16
Dockerfile-alpine.template
View file

@ -4,8 +4,8 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%3.16
RUN set -ex; \ RUN set -ex; \
\ \
apk add --no-cache \ apk add --no-cache \
rsync \
imagemagick \ imagemagick \
rsync \
; \ ; \
\ \
rm /var/spool/cron/crontabs/root; \ rm /var/spool/cron/crontabs/root; \
@ -19,20 +19,20 @@ RUN set -ex; \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
autoconf \ autoconf \
freetype-dev \ freetype-dev \
gmp-dev \
icu-dev \ icu-dev \
imagemagick-dev \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \
libwebp-dev \
libxml2-dev \ libxml2-dev \
libzip-dev \ libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \
libwebp-dev \
gmp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@ -41,6 +41,7 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
@ -48,20 +49,19 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-%%APCU_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \ pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \ pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

20
Dockerfile-debian.template
View file

@ -5,11 +5,11 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
rsync \
bzip2 \
busybox-static \ busybox-static \
bzip2 \
libldap-common \ libldap-common \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
rsync \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \
@ -29,29 +29,28 @@ RUN set -ex; \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libevent-dev \ libevent-dev \
libfreetype6-dev \ libfreetype6-dev \
libgmp-dev \
libicu-dev \ libicu-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
libwebp-dev \ libwebp-dev \
libgmp-dev \ libxml2-dev \
libzip-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
@ -59,20 +58,19 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-%%APCU_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \ pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \ pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
imagick \
memcached \ memcached \
redis \ redis \
imagick \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

2
update.sh
View file

@ -111,8 +111,6 @@ function create_variant() {
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
s/%%CRONTAB_INT%%/'"$crontabInt"'/g; s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
\@docker-php-ext-configure gmp --with-gmp@d;
\@/usr/include/gmp.h@d;
' "$dir/Dockerfile" ' "$dir/Dockerfile"
# Copy the shell scripts # Copy the shell scripts