friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-06-22 04:34:41 +02:00
Code Issues 1 Releases Wiki Activity

Merge pull request #181 from nupplaphil/feat/update_php

Browse source 
Update PHP version
This commit is contained in:
Hypolite Petovan 2022-01-05 14:47:11 +01:00 committed by GitHub
parent 2a414acfcb a562de0ba4
commit d50ef2ad93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 66 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
2021.09/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-buster FROM php:7.4-apache-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

11
2021.09/fpm-alpine/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.4-fpm-alpine
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
cyrus-sasl-dev \ cyrus-sasl-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
libwebp-dev \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
exif \
gd \ gd \
zip \ zip \
opcache \ opcache \

11
2021.09/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-buster FROM php:7.4-fpm-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

11
2021.12-dev/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-buster FROM php:7.4-apache-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

11
2021.12-dev/fpm-alpine/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.4-fpm-alpine
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
cyrus-sasl-dev \ cyrus-sasl-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
libwebp-dev \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
exif \
gd \ gd \
zip \ zip \
opcache \ opcache \

11
2021.12-dev/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-buster FROM php:7.4-fpm-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

11
2021.12-rc/apache/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-apache-buster FROM php:7.4-apache-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

11
2021.12-rc/fpm-alpine/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.3-fpm-alpine FROM php:7.4-fpm-alpine
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
cyrus-sasl-dev \ cyrus-sasl-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
libwebp-dev \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
exif \
gd \ gd \
zip \ zip \
opcache \ opcache \

11
2021.12-rc/fpm/Dockerfile
View file

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.3-fpm-buster FROM php:7.4-fpm-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

9
Dockerfile-alpine.template
View file

@ -53,6 +53,7 @@ RUN set -ex; \
cyrus-sasl-dev \ cyrus-sasl-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
libwebp-dev \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
@ -61,14 +62,14 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
exif \
gd \ gd \
zip \ zip \
opcache \ opcache \

11
Dockerfile-debian.template
View file

@ -1,4 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%-buster FROM php:%%PHP_VERSION%%-%%VARIANT%%-bullseye
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -64,6 +64,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6-dev \ libfreetype6-dev \
libwebp-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
@ -72,10 +73,9 @@ RUN set -ex; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-freetype \
--with-freetype-dir=/usr/include/ \ --with-jpeg \
--with-png-dir=/usr/include/ \ --with-webp \
--with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/$debMultiarch/ \ --with-libdir=lib/$debMultiarch/ \
@ -83,6 +83,7 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \
exif \
zip \ zip \
opcache \ opcache \
ctype \ ctype \

2
update.sh
View file

@ -2,7 +2,7 @@
set -eo pipefail set -eo pipefail
declare -A php_version=( declare -A php_version=(
[default]='7.3' [default]='7.4'
) )
declare -A cmd=( declare -A cmd=(