From ab123984e46ac248b6f2f884eee1cae059b94ca7 Mon Sep 17 00:00:00 2001 From: stephane Date: Tue, 1 Oct 2019 10:15:27 +0200 Subject: [PATCH 01/28] Create branche 7.4 --- php55-apache/DockerFile | 31 ------------------------------- php55-apache/config/php.ini | 23 ----------------------- php56-fpm/DockerFile | 25 ------------------------- php56-fpm/config/php.ini | 23 ----------------------- php72-fpm/DockerFile | 28 ---------------------------- php72-fpm/config/php.ini | 23 ----------------------- php73-fpm/DockerFile | 28 ---------------------------- php73-fpm/config/php.ini | 23 ----------------------- 8 files changed, 204 deletions(-) delete mode 100644 php55-apache/DockerFile delete mode 100644 php55-apache/config/php.ini delete mode 100644 php56-fpm/DockerFile delete mode 100644 php56-fpm/config/php.ini delete mode 100644 php72-fpm/DockerFile delete mode 100644 php72-fpm/config/php.ini delete mode 100755 php73-fpm/DockerFile delete mode 100644 php73-fpm/config/php.ini diff --git a/php55-apache/DockerFile b/php55-apache/DockerFile deleted file mode 100644 index 3c3e1d3..0000000 --- a/php55-apache/DockerFile +++ /dev/null @@ -1,31 +0,0 @@ -FROM php:5.5-apache - -# Install PDO MySQL driver -# See https://github.com/docker-library/php/issues/62 - -# Wheezy and Jessie were recently removed from the mirror network, so if you want to continue fetching Jessie backports, you need to use archive.debian.org instead: -# See https://unix.stackexchange.com/questions/508724/failed-to-fetch-jessie-backports-repository -RUN echo "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list - -RUN apt-get update && apt-get install -y libicu-dev zlib1g-dev libpng-dev mysql-client wget - -RUN docker-php-ext-install pdo -RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-configure intl -RUN docker-php-ext-install intl -RUN docker-php-ext-install zip -RUN docker-php-ext-install gd - -RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer - -# Workaround for write permission on write to MacOS X volumes -# See https://github.com/boot2docker/boot2docker/pull/534 -RUN usermod -u 1000 www-data - -# Allow the rewriting engine -RUN a2enmod rewrite - -COPY config/php.ini /etc/php5/apache2/conf.d/php.ini -COPY config/php.ini /usr/local/etc/php/php.ini - -WORKDIR /var/www/html diff --git a/php55-apache/config/php.ini b/php55-apache/config/php.ini deleted file mode 100644 index 446bcc7..0000000 --- a/php55-apache/config/php.ini +++ /dev/null @@ -1,23 +0,0 @@ -[Date] -; Defines the default timezone used by the date functions -; http://php.net/date.timezone -date.timezone = "Europe/Paris" - -; http://php.net/date.default-latitude -;date.default_latitude = 31.7667 - -; http://php.net/date.default-longitude -;date.default_longitude = 35.2333 - -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 - -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 - -error_reporting=-1 -display_errors = On -html_errors = 0 -display_startup_errors = On -log_errors = On -error_log = /dev/stderr diff --git a/php56-fpm/DockerFile b/php56-fpm/DockerFile deleted file mode 100644 index eeedced..0000000 --- a/php56-fpm/DockerFile +++ /dev/null @@ -1,25 +0,0 @@ -FROM php:5.6-fpm - -# Install PDO MySQL driver -# See https://github.com/docker-library/php/issues/62 - - -RUN apt-get update && apt-get install -y libicu-dev zlib1g-dev libpng-dev git - -RUN docker-php-ext-install pdo -RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-configure intl -RUN docker-php-ext-install intl -RUN docker-php-ext-install zip -RUN docker-php-ext-install gd - -RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer - -# Workaround for write permission on write to MacOS X volumes -# See https://github.com/boot2docker/boot2docker/pull/534 -RUN usermod -u 1000 www-data - -COPY config/php.ini /etc/php5/apache2/conf.d/php.ini -COPY config/php.ini /usr/local/etc/php/php.ini - -WORKDIR /var/www diff --git a/php56-fpm/config/php.ini b/php56-fpm/config/php.ini deleted file mode 100644 index 446bcc7..0000000 --- a/php56-fpm/config/php.ini +++ /dev/null @@ -1,23 +0,0 @@ -[Date] -; Defines the default timezone used by the date functions -; http://php.net/date.timezone -date.timezone = "Europe/Paris" - -; http://php.net/date.default-latitude -;date.default_latitude = 31.7667 - -; http://php.net/date.default-longitude -;date.default_longitude = 35.2333 - -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 - -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 - -error_reporting=-1 -display_errors = On -html_errors = 0 -display_startup_errors = On -log_errors = On -error_log = /dev/stderr diff --git a/php72-fpm/DockerFile b/php72-fpm/DockerFile deleted file mode 100644 index 7309a52..0000000 --- a/php72-fpm/DockerFile +++ /dev/null @@ -1,28 +0,0 @@ -FROM php:7.2-fpm-alpine3.9 - -# Install PDO MySQL driver -# See https://github.com/docker-library/php/issues/62 - -COPY config/php.ini /usr/local/etc/php/php.ini - -RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories - -RUN apk update --update && apk add --update --no-cache icu-dev libpng-dev mysql-client - -RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-configure intl -RUN docker-php-ext-install intl -RUN docker-php-ext-install zip -RUN docker-php-ext-install gd - - -RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} -# Install APCu -RUN pecl install apcu -RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini - -RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer -RUN composer selfupdate -RUN chmod 777 -R /tmp/ - -WORKDIR /var/www/ diff --git a/php72-fpm/config/php.ini b/php72-fpm/config/php.ini deleted file mode 100644 index 18a2eb2..0000000 --- a/php72-fpm/config/php.ini +++ /dev/null @@ -1,23 +0,0 @@ -[Date] -; Defines the default timezone used by the date functions -; http://php.net/date.timezone -date.timezone = "Europe/Paris" - -; http://php.net/date.default-latitude -;date.default_latitude = 31.7667 - -; http://php.net/date.default-longitude -;date.default_longitude = 35.2333 - -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 - -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 - -error_reporting=-1 -display_errors = On -html_errors = On -display_startup_errors = On -log_errors = On -error_log = /dev/stderr diff --git a/php73-fpm/DockerFile b/php73-fpm/DockerFile deleted file mode 100755 index 5276e4b..0000000 --- a/php73-fpm/DockerFile +++ /dev/null @@ -1,28 +0,0 @@ -FROM php:7.3-fpm-alpine3.9 - -# Install PDO MySQL driver -# See https://github.com/docker-library/php/issues/62 - -COPY config/php.ini /usr/local/etc/php/php.ini - -RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories - -RUN apk update --update && apk add --update --no-cache icu-dev libpng-dev libzip-dev mysql-client - -RUN docker-php-ext-install pdo_mysql -RUN docker-php-ext-configure intl -RUN docker-php-ext-install intl -RUN docker-php-ext-install zip -RUN docker-php-ext-install gd - - -RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} -# Install APCu -RUN pecl install apcu -RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini - -RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer -RUN composer selfupdate -RUN chmod 777 -R /tmp/ - -WORKDIR /var/www/ diff --git a/php73-fpm/config/php.ini b/php73-fpm/config/php.ini deleted file mode 100644 index 18a2eb2..0000000 --- a/php73-fpm/config/php.ini +++ /dev/null @@ -1,23 +0,0 @@ -[Date] -; Defines the default timezone used by the date functions -; http://php.net/date.timezone -date.timezone = "Europe/Paris" - -; http://php.net/date.default-latitude -;date.default_latitude = 31.7667 - -; http://php.net/date.default-longitude -;date.default_longitude = 35.2333 - -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 - -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 - -error_reporting=-1 -display_errors = On -html_errors = On -display_startup_errors = On -log_errors = On -error_log = /dev/stderr From e3b863ce83af8e934e259583ab2793ea85403a05 Mon Sep 17 00:00:00 2001 From: stephane Date: Tue, 1 Oct 2019 10:40:23 +0200 Subject: [PATCH 02/28] Clean --- {php74-fpm => php}/DockerFile | 0 {php74-fpm => php}/config/php.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {php74-fpm => php}/DockerFile (100%) rename {php74-fpm => php}/config/php.ini (100%) diff --git a/php74-fpm/DockerFile b/php/DockerFile similarity index 100% rename from php74-fpm/DockerFile rename to php/DockerFile diff --git a/php74-fpm/config/php.ini b/php/config/php.ini similarity index 100% rename from php74-fpm/config/php.ini rename to php/config/php.ini From 6694e5aff6486055f66e7e6d04e53fcc635880ad Mon Sep 17 00:00:00 2001 From: stephane Date: Tue, 1 Oct 2019 12:08:11 +0200 Subject: [PATCH 03/28] Clean --- php/DockerFile => DockerFile | 2 +- php/config/php.ini => php.ini | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename php/DockerFile => DockerFile (94%) rename php/config/php.ini => php.ini (100%) diff --git a/php/DockerFile b/DockerFile similarity index 94% rename from php/DockerFile rename to DockerFile index ea88e22..662caf6 100644 --- a/php/DockerFile +++ b/DockerFile @@ -3,7 +3,7 @@ FROM php:7.4-rc-fpm-alpine3.10 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 -COPY config/php.ini /usr/local/etc/php/php.ini +COPY php.ini /usr/local/etc/php/php.ini RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories diff --git a/php/config/php.ini b/php.ini similarity index 100% rename from php/config/php.ini rename to php.ini From a2ee285a9fd20c0a3ad97611c45d216e2982f72e Mon Sep 17 00:00:00 2001 From: stephane Date: Tue, 1 Oct 2019 12:08:51 +0200 Subject: [PATCH 04/28] Clean --- README.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 2516fb7..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# php-docker From 3a7fa084bf607155b55758a1ea3172574ce1073b Mon Sep 17 00:00:00 2001 From: stephane Date: Tue, 1 Oct 2019 12:10:53 +0200 Subject: [PATCH 05/28] Clean --- DockerFile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename DockerFile => Dockerfile (100%) diff --git a/DockerFile b/Dockerfile similarity index 100% rename from DockerFile rename to Dockerfile From 0fd307e7b09e0fe294d278d23ef0196324eb4512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Mon, 4 Nov 2019 10:04:53 +0100 Subject: [PATCH 06/28] Add user --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 662caf6..e3f768f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,5 +24,6 @@ RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer RUN composer selfupdate RUN chmod 777 -R /tmp/ +RUN deluser www-data && adduser -DH -h /home/www-data -s /sbin/nologin -u 1000 www-data WORKDIR /var/www/ From 3a7181d16f34275ff1d32a45c11bc4bad8546af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Mon, 18 Nov 2019 08:53:26 +0100 Subject: [PATCH 07/28] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3f768f..a9cd2c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,8 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install intl RUN docker-php-ext-install zip RUN docker-php-ext-install gd - +RUN docker-php-ext-configure bcmath +RUN docker-php-ext-install bcmath RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} # Install APCu From 515b62c7aacf21bd949d93a37cae226ffacb3961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Fri, 29 Nov 2019 12:21:56 +0100 Subject: [PATCH 08/28] 7.4.0 ! --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a9cd2c0..609397d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-rc-fpm-alpine3.10 +FROM php:7.4-fpm-alpine3.10 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From a166a5a579aea183a42e1ed4de29bae1ae4eb18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Tue, 3 Dec 2019 17:16:23 +0100 Subject: [PATCH 09/28] Add pcov --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 609397d..705038a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,10 @@ RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} RUN pecl install apcu RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini +# pcov +RUN pecl install pcov +RUN docker-php-ext-enable pcov + RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer RUN composer selfupdate RUN chmod 777 -R /tmp/ From be91bcbcdc2a5d12f57974bf8558bcf27bd3261f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Thu, 30 Apr 2020 16:55:55 +0200 Subject: [PATCH 10/28] add pcntl --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 705038a..2bd66ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN docker-php-ext-install zip RUN docker-php-ext-install gd RUN docker-php-ext-configure bcmath RUN docker-php-ext-install bcmath +RUN docker-php-ext-install pcntl RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} # Install APCu From f45641048ee47c431278d236bf3e1be205520d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Wed, 6 May 2020 12:57:44 +0200 Subject: [PATCH 11/28] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2bd66ff..b1cbf1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-fpm-alpine3.10 +FROM akondas/php:8.0-cli-alpine # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 43ce6c42a9051e2e79268ada0ef23a4d29ca4cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Mon, 29 Jun 2020 15:55:19 +0200 Subject: [PATCH 12/28] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1cbf1a..c19a23d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM akondas/php:8.0-cli-alpine +FROM php:8.0-rc-fpm-alpine3.12 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 66bca3fea798cf779537b129a237a90bea46aa56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Mon, 29 Jun 2020 22:23:54 +0200 Subject: [PATCH 13/28] Update Dockerfile --- Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c19a23d..502b2ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,13 +19,10 @@ RUN docker-php-ext-install bcmath RUN docker-php-ext-install pcntl RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} -# Install APCu -RUN pecl install apcu -RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini -# pcov -RUN pecl install pcov -RUN docker-php-ext-enable pcov +RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar && mv pickle.phar /usr/local/bin/pickle && chmod +x /usr/local/bin/pickle +RUN pickle install apcu +RUN pickle install pcov RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer RUN composer selfupdate From 3e6cd2556aaf5a95dde7dd8b8be28e22ea35a2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Thu, 9 Jul 2020 14:58:51 +0200 Subject: [PATCH 14/28] Update Dockerfile --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 502b2ad..334b46b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,11 @@ RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle. RUN pickle install apcu RUN pickle install pcov +RUN echo "extension=pcov.so" >> /usr/local/etc/php/php.ini +RUN echo "extension=apcu.so" >> /usr/local/etc/php/php.ini + RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer -RUN composer selfupdate +RUN composer selfupdate --2 RUN chmod 777 -R /tmp/ RUN deluser www-data && adduser -DH -h /home/www-data -s /sbin/nologin -u 1000 www-data From 84eed1858562d45936f9330722ca31aa9719bef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Wed, 2 Dec 2020 13:55:18 +0100 Subject: [PATCH 15/28] stable :O --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 334b46b..ec3b577 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-rc-fpm-alpine3.12 +FROM php:8.0-fpm-alpine3.12 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 7eea2c9c1ac8b602529a6e2ad64cf6383db8af03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Tue, 30 Nov 2021 14:41:59 +0100 Subject: [PATCH 16/28] clean From 6ea1eb9d31277e48981b67201148991bad11563f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Mon, 13 Dec 2021 09:51:25 +0100 Subject: [PATCH 17/28] rebuild --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec3b577..c7c458a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm-alpine3.12 +FROM php:8.0-fpm-alpine3.15 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 @@ -23,9 +23,13 @@ RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar && mv pickle.phar /usr/local/bin/pickle && chmod +x /usr/local/bin/pickle RUN pickle install apcu RUN pickle install pcov +RUN pecl install swoole + RUN echo "extension=pcov.so" >> /usr/local/etc/php/php.ini RUN echo "extension=apcu.so" >> /usr/local/etc/php/php.ini +RUN echo "extension=swoole.so" >> /usr/local/etc/php/php.ini + RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer RUN composer selfupdate --2 From 46184da35671bda842b88f60eafbf51d3cc38c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Mon, 13 Dec 2021 10:29:31 +0100 Subject: [PATCH 18/28] php 8.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7c458a..c406eef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm-alpine3.15 +FROM php:8.1-fpm-alpine3.15 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 68eff9fc6c51fc6c51854898cfd17fb5e73adca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Tue, 7 Jun 2022 15:26:43 +0200 Subject: [PATCH 19/28] update pickle version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c406eef..da396cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN docker-php-ext-install pcntl RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} -RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar && mv pickle.phar /usr/local/bin/pickle && chmod +x /usr/local/bin/pickle +RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.9/pickle.phar && mv pickle.phar /usr/local/bin/pickle && chmod +x /usr/local/bin/pickle RUN pickle install apcu RUN pickle install pcov RUN pecl install swoole From 9c7fe938b5e062e11ab690b917c07883b3222880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Tue, 18 Oct 2022 11:36:26 +0200 Subject: [PATCH 20/28] Update and add exif --- Dockerfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index da396cb..dcf741d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm-alpine3.15 +FROM php:8.1.11-fpm-alpine3.15 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 @@ -36,4 +36,16 @@ RUN composer selfupdate --2 RUN chmod 777 -R /tmp/ RUN deluser www-data && adduser -DH -h /home/www-data -s /sbin/nologin -u 1000 www-data +RUN apk update \ + && apk upgrade \ + && apk add --no-cache \ + freetype-dev \ + libpng-dev \ + jpeg-dev \ + libjpeg-turbo-dev +RUN docker-php-ext-configure gd --with-freetype --with-jpeg +RUN docker-php-ext-install -j$(nproc) gd + +RUN docker-php-ext-install exif + WORKDIR /var/www/ From ba01022446d9cc8f0de3c4e24450395fdd609ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Tue, 8 Nov 2022 11:50:36 +0100 Subject: [PATCH 21/28] fix build --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcf741d..1b6fab4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,6 @@ FROM php:8.1.11-fpm-alpine3.15 COPY php.ini /usr/local/etc/php/php.ini -RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories - RUN apk update --update && apk add --update --no-cache icu-dev libpng-dev libzip-dev mysql-client RUN docker-php-ext-install pdo_mysql From d538b3f4d5e742c79651147a5d70ed47df87ca8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Wed, 16 Nov 2022 05:16:15 +0100 Subject: [PATCH 22/28] welcome php 8.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b6fab4..71ef253 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.11-fpm-alpine3.15 +FROM php:8.0.26RC1-fpm-alpine3.15 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 09a6ce6721203c019c47ef901e11b795ea7592ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Wed, 30 Nov 2022 09:16:16 +0100 Subject: [PATCH 23/28] php 8.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71ef253..22ce8c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.26RC1-fpm-alpine3.15 +FROM php:8.2.0RC6-fpm-alpine3.15 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From e19f823b0546e5dcfa0fff105fcc469393f70a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Fri, 9 Dec 2022 14:44:07 +0100 Subject: [PATCH 24/28] php 8.2.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22ce8c3..e15a33b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0RC6-fpm-alpine3.15 +FROM php:8.2.0-fpm-alpine3.17 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 24a28385f7f9fb3bc8416a54f1d1399a9894890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Fri, 6 Oct 2023 13:44:45 +0200 Subject: [PATCH 25/28] Updae --- .idea/.gitignore | 8 ++++++++ .idea/docker-apache2-php.iml | 8 ++++++++ .idea/modules.xml | 8 ++++++++ .idea/php.xml | 21 +++++++++++++++++++++ .idea/vcs.xml | 6 ++++++ Dockerfile | 2 +- php.ini | 2 +- 7 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/docker-apache2-php.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/docker-apache2-php.iml b/.idea/docker-apache2-php.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/docker-apache2-php.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..af92e2d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..3e28364 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e15a33b..5840439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-fpm-alpine3.17 +FROM php:8.2.11-fpm-alpine3.17 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 diff --git a/php.ini b/php.ini index 18a2eb2..4bce531 100644 --- a/php.ini +++ b/php.ini @@ -15,7 +15,7 @@ date.timezone = "Europe/Paris" ; http://php.net/date.sunset-zenith ;date.sunset_zenith = 90.583333 -error_reporting=-1 +error_reporting=E_ALL ^ E_DEPRECATED display_errors = On html_errors = On display_startup_errors = On From e67fbe8dddbdcad9f60262ee9efaba550629f85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Fri, 6 Oct 2023 13:45:05 +0200 Subject: [PATCH 26/28] Updae --- .idea/.gitignore | 8 -------- .idea/docker-apache2-php.iml | 8 -------- .idea/modules.xml | 8 -------- .idea/php.xml | 21 --------------------- .idea/vcs.xml | 6 ------ 5 files changed, 51 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/docker-apache2-php.iml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/docker-apache2-php.iml b/.idea/docker-apache2-php.iml deleted file mode 100644 index c956989..0000000 --- a/.idea/docker-apache2-php.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index af92e2d..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 3e28364..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 8ba96f7098d3643b967090dc1d8872e6747fbb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Tue, 24 Oct 2023 18:27:44 +0200 Subject: [PATCH 27/28] 8.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5840439..3db27b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.11-fpm-alpine3.17 +FROM php:8.3.0RC3-fpm-alpine3.17 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 From 825f262fb569fd90576acaa5a5255c19e3bcfaf1 Mon Sep 17 00:00:00 2001 From: fezfez Date: Tue, 12 Nov 2024 14:26:40 +0100 Subject: [PATCH 28/28] 8.3.13 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3db27b4..dc20201 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0RC3-fpm-alpine3.17 +FROM php:8.3.13-fpm-alpine3.20 # Install PDO MySQL driver # See https://github.com/docker-library/php/issues/62 @@ -21,6 +21,7 @@ RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.9/pickle.phar && mv pickle.phar /usr/local/bin/pickle && chmod +x /usr/local/bin/pickle RUN pickle install apcu RUN pickle install pcov +RUN apk add brotli-dev RUN pecl install swoole