From a8b279bdf2e0fda88b85b7e2c02d0fe397d5ae41 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 24 Nov 2019 09:56:11 +0700 Subject: [PATCH 001/311] chore: setup ldap and bz2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aaf5788..1a99499 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN \ # Dev deps apk add -U --virtual temp autoconf g++ file re2c make zlib-dev libtool pcre-dev openldap-dev libxml2-dev bzip2-dev \ # Deps - && apk add libpng-dev gmp-dev icu-dev libzip-dev \ + && apk add libpng-dev gmp-dev icu-dev libzip-dev openldap libbz2 \ # PHP extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ From c5dde2afc70569c7ce6bccda0726dfd7aa7aa60e Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 28 Nov 2019 21:05:47 +0700 Subject: [PATCH 002/311] docs: add basic readme --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..594517b --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +## docker-phpfpm + +Docker PHP FPM with lean alpine base. +It contains PHP7.2.24 with plenty of common extensions. + +## Usage +To pull latest image: + +```sh +docker pull adhocore/phpfpm +``` + +Please check [Dockerfile](./Dockerfile) for more. From c25cceb56bad05404070fbc24617afe8137def4f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 30 Nov 2019 11:46:09 +0700 Subject: [PATCH 003/311] chore: add dockerignore --- .dockerignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..13b1bc3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git +.github +.gitignore From ceded33b02ee3efcb97fff96ec2e5060bdf0979c Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 30 Nov 2019 11:49:02 +0700 Subject: [PATCH 004/311] feat: bump to php7.4, add more php exts --- Dockerfile | 55 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a99499..4c0f593 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,30 +1,41 @@ -FROM php:7.2.24-fpm-alpine3.10 +FROM php:7.4.0-fpm-alpine3.10 MAINTAINER Jitendra Adhikari +ENV XHPROF_VERSION=5.0.1 +ENV PECL_EXTENSIONS="redis yaml imagick xdebug" +ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli opcache pdo_mysql soap zip" + +RUN \ + # deps + apk add -U --virtual temp \ + autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev \ + && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml + RUN \ - # Define - PECL_EXTENSIONS="redis"; \ - PHP_EXTENSIONS="zip mysqli pdo_mysql opcache bcmath gd gmp intl ldap exif soap bz2 calendar"; \ - # Dev deps - apk add -U --virtual temp autoconf g++ file re2c make zlib-dev libtool pcre-dev openldap-dev libxml2-dev bzip2-dev \ - # Deps - && apk add libpng-dev gmp-dev icu-dev libzip-dev openldap libbz2 \ - # PHP extensions - && docker-php-source extract \ + # php extensions + docker-php-source extract \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ - && docker-php-ext-enable $PECL_EXTENSIONS \ - && docker-php-ext-install $PHP_EXTENSIONS \ - && docker-php-source delete \ - # Composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ - # Cleanup - && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* \ - && rm -rf /usr/share/doc/* /usr/share/man/* \ - && rm -rf /usr/src/php.tar.xz /usr/local/bin/docker-php-ext* + && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} \ + && docker-php-ext-install $PHP_EXTENSIONS -USER www-data +RUN \ + # tideways_xhprof + curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + && tar xzf /tmp/xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ + && phpize && ./configure \ + && make && make install \ + && docker-php-ext-enable tideways_xhprof \ + && cd .. && rm -rf php-xhprof-extension-$XHPROF_VERSION /tmp/xhprof.tar.gz \ + && docker-php-source delete -WORKDIR /var/www/html +RUN \ + # composer + curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +RUN \ + # cleanup + apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* From 15da16eb34bb928792c80310c963440fda49caf9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 30 Nov 2019 12:27:35 +0700 Subject: [PATCH 005/311] chore: add more dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 13b1bc3..48e6bbf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ .git .github .gitignore +README.md From 1d0de1abfff56d9706f320b900db6433f9f5f598 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 30 Nov 2019 12:29:16 +0700 Subject: [PATCH 006/311] docs: update readme --- README.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 594517b..961956a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## docker-phpfpm Docker PHP FPM with lean alpine base. -It contains PHP7.2.24 with plenty of common extensions. +It contains PHP7.4.0 with plenty of common extensions. ## Usage To pull latest image: @@ -10,4 +10,83 @@ To pull latest image: docker pull adhocore/phpfpm ``` -Please check [Dockerfile](./Dockerfile) for more. +To use in docker-compose +```yaml +# ./docker-compose.yml +version: '3' + +services: + phpfpm: + image: adhocore/phpfpm:7.4 + container_name: phpfpm + volumes: + # Here you can also volume php ini settings + # - /path/to/zz-overrides:/usr/local/etc/php/conf.d/zz-overrides.ini + ports: + - 9000:9000 + environment: + # ... +``` + +### Extensions + +The following PHP extensions are installed: + +``` +bcmath +bz2 +calendar +Core +ctype +curl +date +dom +exif +fileinfo +filter +ftp +gd +gettext +gmp +hash +iconv +imagick +intl +json +ldap +libxml +mbstring +mysqli +mysqlnd +openssl +pcre +PDO +pdo_mysql +pdo_sqlite +Phar +posix +readline +redis +Reflection +session +SimpleXML +soap +sodium +SPL +sqlite3 +standard +tideways_xhprof +tokenizer +xdebug +xml +xmlreader +xmlwriter +yaml +Zend OPcache +zip +zlib +``` + +`phalcon` has been removed as it conflicted with `pcre` in `PHP7.4`. + +Read more about [tideways](https://github.com/tideways/php-xhprof-extension). From ed09316d3f4162e1986141662b158b27cd4b8151 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 30 Nov 2019 12:53:58 +0700 Subject: [PATCH 007/311] docs: add tag in pull cmd [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 961956a..826b889 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ It contains PHP7.4.0 with plenty of common extensions. To pull latest image: ```sh -docker pull adhocore/phpfpm +docker pull adhocore/phpfpm:7.4 ``` To use in docker-compose From a6bd81b6bc2085b5f13272e0a8b642191bf1d713 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 2 Dec 2019 20:28:01 +0700 Subject: [PATCH 008/311] feat: add phalcon and psr --- Dockerfile | 14 +++++++++++--- README.md | 7 +++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c0f593..93bcdc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,9 @@ FROM php:7.4.0-fpm-alpine3.10 MAINTAINER Jitendra Adhikari ENV XHPROF_VERSION=5.0.1 -ENV PECL_EXTENSIONS="redis yaml imagick xdebug" -ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli opcache pdo_mysql soap zip" +ENV PHALCON_VERSION=4.0.0-rc.3 +ENV PECL_EXTENSIONS="imagick psr redis xdebug yaml" +ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli pdo_mysql soap zip" RUN \ # deps @@ -18,7 +19,7 @@ RUN \ docker-php-source extract \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ - && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} \ + && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ && docker-php-ext-install $PHP_EXTENSIONS RUN \ @@ -31,6 +32,13 @@ RUN \ && cd .. && rm -rf php-xhprof-extension-$XHPROF_VERSION /tmp/xhprof.tar.gz \ && docker-php-source delete +RUN \ + # phalcon + curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + && cd /tmp/ && tar xvzf phalcon.tar.gz \ + && cd cphalcon-$PHALCON_VERSION/build && sh install \ + && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini + RUN \ # composer curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer diff --git a/README.md b/README.md index 826b889..971b039 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,10 @@ pcre PDO pdo_mysql pdo_sqlite +phalcon Phar posix +psr readline redis Reflection @@ -87,6 +89,7 @@ zip zlib ``` -`phalcon` has been removed as it conflicted with `pcre` in `PHP7.4`. +`phalcon` web framework `4.0.0-rc.3` has been installed. -Read more about [tideways](https://github.com/tideways/php-xhprof-extension). +Read more about [tideways](https://github.com/tideways/php-xhprof-extension) +and [phalcon](https://github.com/phalcon/cphalcon). From df50005bfa08bc35feac4bf5ba2b160063e8cb97 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 3 Dec 2019 17:27:26 +0700 Subject: [PATCH 009/311] feat: add extensions (ast, igbinary, pcntl, pgsql, uuid) --- Dockerfile | 13 +++++++------ README.md | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93bcdc2..6b99ded 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,15 @@ MAINTAINER Jitendra Adhikari ENV XHPROF_VERSION=5.0.1 ENV PHALCON_VERSION=4.0.0-rc.3 -ENV PECL_EXTENSIONS="imagick psr redis xdebug yaml" -ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli pdo_mysql soap zip" +ENV PECL_EXTENSIONS="ast igbinary imagick psr redis uuid xdebug yaml" +ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql soap zip" RUN \ # deps apk add -U --virtual temp \ autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ - icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev \ - && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml libpq RUN \ # php extensions @@ -20,7 +20,8 @@ RUN \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ - && docker-php-ext-install $PHP_EXTENSIONS + && docker-php-ext-install $PHP_EXTENSIONS \ + && pecl clear-cache RUN \ # tideways_xhprof @@ -35,7 +36,7 @@ RUN \ RUN \ # phalcon curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ - && cd /tmp/ && tar xvzf phalcon.tar.gz \ + && cd /tmp/ && tar xzf phalcon.tar.gz \ && cd cphalcon-$PHALCON_VERSION/build && sh install \ && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini diff --git a/README.md b/README.md index 971b039..46c10a1 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ services: The following PHP extensions are installed: ``` +ast bcmath bz2 calendar @@ -50,6 +51,7 @@ gettext gmp hash iconv +igbinary imagick intl json @@ -59,10 +61,13 @@ mbstring mysqli mysqlnd openssl +pcntl pcre PDO pdo_mysql +pdo_pgsql pdo_sqlite +pgsql phalcon Phar posix @@ -79,6 +84,7 @@ sqlite3 standard tideways_xhprof tokenizer +uuid xdebug xml xmlreader From 1955ed56cbb70c721f6166b20fd074664b971b0b Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 13 Dec 2019 19:53:19 +0700 Subject: [PATCH 010/311] refactor: pass in -j $nproc, organise comment --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b99ded..49366ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,24 +7,24 @@ ENV PHALCON_VERSION=4.0.0-rc.3 ENV PECL_EXTENSIONS="ast igbinary imagick psr redis uuid xdebug yaml" ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql soap zip" +# deps RUN \ - # deps apk add -U --virtual temp \ autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml libpq +# php extensions RUN \ - # php extensions docker-php-source extract \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ - && docker-php-ext-install $PHP_EXTENSIONS \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS \ && pecl clear-cache +# tideways_xhprof RUN \ - # tideways_xhprof curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ && tar xzf /tmp/xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ && phpize && ./configure \ @@ -33,18 +33,18 @@ RUN \ && cd .. && rm -rf php-xhprof-extension-$XHPROF_VERSION /tmp/xhprof.tar.gz \ && docker-php-source delete +# phalcon RUN \ - # phalcon curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ && cd /tmp/ && tar xzf phalcon.tar.gz \ && cd cphalcon-$PHALCON_VERSION/build && sh install \ && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini +# composer RUN \ - # composer curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer +# cleanup RUN \ - # cleanup apk del temp \ && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* From bc2d9a06a70f45b73ddebeaba2b8d8dae2296920 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 14 Dec 2019 05:47:23 +0700 Subject: [PATCH 011/311] chore: add license --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3843d16 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Jitendra Adhikari + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 0dba887bf6b57c7b9701ebac04b73c2c6d8fd7e4 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 14 Dec 2019 06:07:54 +0700 Subject: [PATCH 012/311] refactor: extract cleanup to different section --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49366ca..88c2993 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,7 @@ RUN \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS \ - && pecl clear-cache + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS # tideways_xhprof RUN \ @@ -29,9 +28,7 @@ RUN \ && tar xzf /tmp/xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ && phpize && ./configure \ && make && make install \ - && docker-php-ext-enable tideways_xhprof \ - && cd .. && rm -rf php-xhprof-extension-$XHPROF_VERSION /tmp/xhprof.tar.gz \ - && docker-php-source delete + && docker-php-ext-enable tideways_xhprof # phalcon RUN \ @@ -47,4 +44,6 @@ RUN \ # cleanup RUN \ apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && pecl clear-cache \ + && docker-php-source delete From dd31a472b1476fb740ac55162019d11a7a84efd9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 14 Dec 2019 06:44:40 +0700 Subject: [PATCH 013/311] fix: pecl clear cant be isolated --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 88c2993..a11f2c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,8 @@ RUN \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS \ + && pecl clear-cache # tideways_xhprof RUN \ @@ -45,5 +46,4 @@ RUN \ RUN \ apk del temp \ && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ - && pecl clear-cache \ && docker-php-source delete From 565b5e41260e270c7630e290d36ad51549e7be09 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 16 Dec 2019 20:08:59 +0700 Subject: [PATCH 014/311] feat(dockerfile): add plenty of extensions --- Dockerfile | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a11f2c9..9fb0407 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,23 +4,40 @@ MAINTAINER Jitendra Adhikari ENV XHPROF_VERSION=5.0.1 ENV PHALCON_VERSION=4.0.0-rc.3 -ENV PECL_EXTENSIONS="ast igbinary imagick psr redis uuid xdebug yaml" -ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql soap zip" +ENV SWOOLE_VERSION=4.4.12 +ENV PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack psr redis ssh2-1.2 uuid xdebug yaml" +ENV PECL_BUNDLE="memcached event" +ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" # deps RUN \ apk add -U --virtual temp \ + # dev deps autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml libpq + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev \ + # prod deps + && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent # php extensions RUN \ docker-php-source extract \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ - && docker-php-ext-enable ${PECL_EXTENSIONS//[-\.0-9]/} opcache \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS \ + && cd /usr/src/php/ext/ \ + && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ + && cd /usr/local/etc/php/conf.d/ \ + && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ && pecl clear-cache # tideways_xhprof From 29a5810ca1de68bc16377219c60493fb2574fc80 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 16 Dec 2019 20:09:11 +0700 Subject: [PATCH 015/311] docs: organize --- README.md | 79 +++++++++++++------------------------------------------ 1 file changed, 19 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 46c10a1..0c18143 100644 --- a/README.md +++ b/README.md @@ -33,66 +33,25 @@ services: The following PHP extensions are installed: ``` -ast -bcmath -bz2 -calendar -Core -ctype -curl -date -dom -exif -fileinfo -filter -ftp -gd -gettext -gmp -hash -iconv -igbinary -imagick -intl -json -ldap -libxml -mbstring -mysqli -mysqlnd -openssl -pcntl -pcre -PDO -pdo_mysql -pdo_pgsql -pdo_sqlite -pgsql -phalcon -Phar -posix -psr -readline -redis -Reflection -session -SimpleXML -soap -sodium -SPL -sqlite3 -standard -tideways_xhprof -tokenizer -uuid -xdebug -xml -xmlreader -xmlwriter -yaml -Zend OPcache -zip -zlib +- ast - bcmath - bz2 - calendar +- cgi-fcgi - core - ctype - curl +- date - dom - event - exif +- fileinfo - filter - ftp - gd +- gettext - gmp - hash - iconv +- igbinary - imagick - imap - intl +- json - ldap - libxml - lzf +- mbstring - memcached - mongodb - msgpack +- mysqli - mysqlnd - openssl - pcntl +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phalcon - phar +- posix - psr - readline - redis +- reflection - session - simplexml - soap +- sockets - sodium - spl - sqlite3 +- ssh2 - standard - swoole - swoole_async +- sysvmsg - sysvsem - sysvshm - tideways_xhprof +- tidy - tokenizer - uuid - xdebug +- xml - xmlreader - xmlwriter - yaml +- zend opcache - zip - zlib ``` `phalcon` web framework `4.0.0-rc.3` has been installed. From 49e307edfb06c90791cf0467ca2b9e720f970f3b Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 17 Dec 2019 19:01:33 +0700 Subject: [PATCH 016/311] chore: extract xhprof in /tmp --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fb0407..73eab13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,9 +43,9 @@ RUN \ # tideways_xhprof RUN \ curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ - && tar xzf /tmp/xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ + && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ && phpize && ./configure \ - && make && make install \ + && make -j "$(nproc)" && make install \ && docker-php-ext-enable tideways_xhprof # phalcon From 6cb65d5a4d8e1776e684d311b9f7b07c28ba75fd Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 17 Dec 2019 19:42:32 +0700 Subject: [PATCH 017/311] refactor: make single RUN --- Dockerfile | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73eab13..a771af2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,20 +10,19 @@ ENV PECL_BUNDLE="memcached event" ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" -# deps RUN \ - apk add -U --virtual temp \ +# deps + apk add -U --no-cache --virtual temp \ # dev deps autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev \ # prod deps - && apk add icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent - + && apk add --no-cache icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent \ +# # php extensions -RUN \ - docker-php-source extract \ + && docker-php-source extract \ && pecl channel-update pecl.php.net \ && pecl install $PECL_EXTENSIONS \ && cd /usr/src/php/ext/ \ @@ -38,29 +37,25 @@ RUN \ && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ - && pecl clear-cache - + && pecl clear-cache \ + && docker-php-source delete \ +# # tideways_xhprof -RUN \ - curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ && phpize && ./configure \ && make -j "$(nproc)" && make install \ - && docker-php-ext-enable tideways_xhprof - + && docker-php-ext-enable tideways_xhprof \ +# # phalcon -RUN \ - curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ && cd /tmp/ && tar xzf phalcon.tar.gz \ && cd cphalcon-$PHALCON_VERSION/build && sh install \ - && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini - + && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ +# # composer -RUN \ - curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ +# # cleanup -RUN \ - apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ - && docker-php-source delete + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* From 80b41183348ed3b09189cee5b7a2c0744aa7dae5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 18 Dec 2019 06:54:18 +0700 Subject: [PATCH 018/311] chore: consolidate env layers --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a771af2..25612af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,14 @@ FROM php:7.4.0-fpm-alpine3.10 MAINTAINER Jitendra Adhikari -ENV XHPROF_VERSION=5.0.1 -ENV PHALCON_VERSION=4.0.0-rc.3 -ENV SWOOLE_VERSION=4.4.12 -ENV PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack psr redis ssh2-1.2 uuid xdebug yaml" -ENV PECL_BUNDLE="memcached event" -ENV PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" +ENV \ + XHPROF_VERSION=5.0.1 \ + PHALCON_VERSION=4.0.0-rc.3 \ + SWOOLE_VERSION=4.4.12 \ + PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack psr redis ssh2-1.2 uuid xdebug yaml" \ + PECL_BUNDLE="memcached event" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" RUN \ # deps From e9bc4707cebfa217e2d08cba2aa0a619b584ff43 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 18 Dec 2019 06:54:35 +0700 Subject: [PATCH 019/311] docs: add swoole url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c18143..5096c81 100644 --- a/README.md +++ b/README.md @@ -57,4 +57,4 @@ The following PHP extensions are installed: `phalcon` web framework `4.0.0-rc.3` has been installed. Read more about [tideways](https://github.com/tideways/php-xhprof-extension) -and [phalcon](https://github.com/phalcon/cphalcon). +[swoole](https://www.swoole.co.uk/) and [phalcon](https://github.com/phalcon/cphalcon). From b3300eb1536bbc0e811577bc341ad1aa1b452452 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 07:12:57 +0700 Subject: [PATCH 020/311] feat: add docker-php-ext-disable --- docker-php-ext-disable.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 docker-php-ext-disable.sh diff --git a/docker-php-ext-disable.sh b/docker-php-ext-disable.sh new file mode 100755 index 0000000..885c850 --- /dev/null +++ b/docker-php-ext-disable.sh @@ -0,0 +1,35 @@ +#!/bin/sh +set -e + +extDir=$(php -r 'echo ini_get("extension_dir");') +iniDir=$PHP_INI_DIR/conf.d/ + +usage() { + echo "usage: $0 [options] module-name [module-name ...]" + echo " ie: $0 xdebug" + echo " $0 xdebug phalcon" + echo + echo 'Possible values for module-name:' + cat $PHP_INI_DIR/conf.d/*.ini \ + | sed -E "s/(zend_|extension\=|${extDir//\//\\/}\/|\.so)//g" \ + | sort \ + | xargs + echo + + exit 1 +} + +modules= +for module; do + [[ "$module" == "--help" ]] \ + || [[ "$module" == "-h" ]] \ + && usage >&2 + [[ -n "$modules" ]] \ + && modules="$modules|(=|\/)$module.so" \ + || modules="(=|\/)$module.so" +done + +[[ -n "$modules" ]] \ + && rmIni=$(grep -lE "$modules" $PHP_INI_DIR/conf.d/*.ini) \ + && echo "$rmIni" \ + | xargs rm From 22c65877ac87f29c498be86caa06a4baf58121a8 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 07:13:16 +0700 Subject: [PATCH 021/311] feat: add pcov extension --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25612af..2201516 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV \ XHPROF_VERSION=5.0.1 \ PHALCON_VERSION=4.0.0-rc.3 \ SWOOLE_VERSION=4.4.12 \ - PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack psr redis ssh2-1.2 uuid xdebug yaml" \ + PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack pcov psr redis ssh2-1.2 uuid xdebug yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" @@ -60,3 +60,6 @@ RUN \ # cleanup && apk del temp \ && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# docker-php-ext-disable +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable From 2fe3ea46cc122f5a233c91479c42f15b99ab9bda Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 07:33:17 +0700 Subject: [PATCH 022/311] chore: add editorconfig --- .editorconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..8eb13a9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +; http://editorconfig.org +; +; Sublime: https://github.com/sindresorhus/editorconfig-sublime +; Phpstorm: https://plugins.jetbrains.com/plugin/7294-editorconfig + +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[{*.md,*.php}] +indent_size = 4 From d227d4ca040b2c4510ee226051aafbc906248dca Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 07:43:48 +0700 Subject: [PATCH 023/311] docs: add size, update extensions, about production usage --- README.md | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5096c81..9d96f30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ## docker-phpfpm -Docker PHP FPM with lean alpine base. -It contains PHP7.4.0 with plenty of common extensions. +Docker PHP FPM with lean alpine base. The download size is just about 90MB. + +It contains PHP7.4.0 with plenty of common and useful extensions. ## Usage To pull latest image: @@ -34,14 +35,14 @@ The following PHP extensions are installed: ``` - ast - bcmath - bz2 - calendar -- cgi-fcgi - core - ctype - curl -- date - dom - event - exif -- fileinfo - filter - ftp - gd -- gettext - gmp - hash - iconv -- igbinary - imagick - imap - intl -- json - ldap - libxml - lzf -- mbstring - memcached - mongodb - msgpack -- mysqli - mysqlnd - openssl - pcntl +- core - ctype - curl - date +- dom - event - exif - fileinfo +- filter - ftp - gd - gettext +- gmp - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - openssl - pcntl - pcov - pcre - pdo - pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql - phalcon - phar - posix - psr - readline - redis @@ -54,7 +55,23 @@ The following PHP extensions are installed: - zend opcache - zip - zlib ``` -`phalcon` web framework `4.0.0-rc.3` has been installed. +Read more about +[pcov](https://github.com/krakjoe/pcov), +[phalcon](https://github.com/phalcon/cphalcon), +[psr](https://github.com/jbboehr/php-psr), +[swoole](https://www.swoole.co.uk/), +[xhprof](https://github.com/tideways/php-xhprof-extension) + +### Production Usage + +For production you may want to get rid of some extensions that are not really required. +In such case, you can build a custom image on top `adhocore/phpfpm:7.4` like so: + +```Dockerfile +FROM adhocore/phpfpm:7.4 + +# Disable extensions you won't need. You can add as much as you want separated by space. +RUN docker-php-ext-disable xdebug pcov +``` -Read more about [tideways](https://github.com/tideways/php-xhprof-extension) -[swoole](https://www.swoole.co.uk/) and [phalcon](https://github.com/phalcon/cphalcon). +> `docker-php-ext-disable` is shell script available in `adhocore/phpfpm:7.4` only and not in official PHP docker images. From 99066a750820dcc34072353842ac9d371bbbaa77 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 18:22:40 +0700 Subject: [PATCH 024/311] feat: add xlswriter --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2201516..773ec67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV \ XHPROF_VERSION=5.0.1 \ PHALCON_VERSION=4.0.0-rc.3 \ SWOOLE_VERSION=4.4.12 \ - PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack pcov psr redis ssh2-1.2 uuid xdebug yaml" \ + PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack pcov psr redis ssh2-1.2 uuid xdebug xlswriter yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" From 4e734bcc2f2dc2175605f0b3f1a4965fbe601209 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 19 Dec 2019 18:27:02 +0700 Subject: [PATCH 025/311] docs: update extensions list --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d96f30..023519d 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ The following PHP extensions are installed: - ssh2 - standard - swoole - swoole_async - sysvmsg - sysvsem - sysvshm - tideways_xhprof - tidy - tokenizer - uuid - xdebug -- xml - xmlreader - xmlwriter - yaml -- zend opcache - zip - zlib +- xlswriter - xml - xmlreader - xmlwriter +- yaml - zend opcache - zip - zlib ``` Read more about From 9da72f45e35b0f00d44f3f3b055598f6ab1d67ab Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2019 22:18:32 +0000 Subject: [PATCH 026/311] chore(deps): bump php from 7.4.0-fpm-alpine3.10 to 7.4.1-fpm-alpine3.10 Bumps php from 7.4.0-fpm-alpine3.10 to 7.4.1-fpm-alpine3.10. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 773ec67..f6653f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0-fpm-alpine3.10 +FROM php:7.4.1-fpm-alpine3.10 MAINTAINER Jitendra Adhikari From e8cf3d0d5eaf344c4ad4d8b12ee68c925f83b1cf Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 20 Dec 2019 19:34:58 +0700 Subject: [PATCH 027/311] feat: add apcu, ds, ev, hrtime, lua, oauth, yaf extensions --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6653f7..f47ee0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,9 @@ ENV \ XHPROF_VERSION=5.0.1 \ PHALCON_VERSION=4.0.0-rc.3 \ SWOOLE_VERSION=4.4.12 \ - PECL_EXTENSIONS="ast igbinary imagick lzf mongodb msgpack pcov psr redis ssh2-1.2 uuid xdebug xlswriter yaml" \ + MAXMIND_VERSION=1.4.2 \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ + ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" @@ -17,10 +19,10 @@ RUN \ # dev deps autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ # prod deps && apk add --no-cache icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ # # php extensions && docker-php-source extract \ @@ -63,3 +65,5 @@ RUN \ # docker-php-ext-disable COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +COPY ext.php /ext.php From daf67525f78d33702b59c179718a4f6cc8b974f3 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 20 Dec 2019 19:36:42 +0700 Subject: [PATCH 028/311] chore: add ext.php --- ext.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ext.php diff --git a/ext.php b/ext.php new file mode 100644 index 0000000..edb824a --- /dev/null +++ b/ext.php @@ -0,0 +1,11 @@ + Date: Fri, 20 Dec 2019 19:36:58 +0700 Subject: [PATCH 029/311] docs: update extensions --- README.md | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 023519d..b682235 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about 90MB. -It contains PHP7.4.0 with plenty of common and useful extensions. +It contains PHP7.4.1 with plenty of common and useful extensions. ## Usage To pull latest image: @@ -34,25 +34,27 @@ services: The following PHP extensions are installed: ``` -- ast - bcmath - bz2 - calendar -- core - ctype - curl - date -- dom - event - exif - fileinfo -- filter - ftp - gd - gettext -- gmp - hash - iconv - igbinary +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- event - exif - fileinfo - filter +- ftp - gd - gettext - gmp +- hash - hrtime - iconv - igbinary - imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - openssl - pcntl - pcov -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phalcon - phar -- posix - psr - readline - redis -- reflection - session - simplexml - soap -- sockets - sodium - spl - sqlite3 -- ssh2 - standard - swoole - swoole_async -- sysvmsg - sysvsem - sysvshm - tideways_xhprof -- tidy - tokenizer - uuid - xdebug -- xlswriter - xml - xmlreader - xmlwriter -- yaml - zend opcache - zip - zlib +- ldap - libxml - lua - lzf +- mbstring - memcached - mongodb - msgpack +- mysqli - mysqlnd - oauth - openssl +- pcntl - pcov - pcre - pdo +- pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql +- phalcon - phar - posix - psr +- readline - redis - reflection - session +- simplexml - soap - sockets - sodium +- spl - sqlite3 - ssh2 - standard +- swoole - swoole_async - sysvmsg - sysvsem +- sysvshm - tideways_xhprof - tidy - tokenizer +- uuid - xdebug - xlswriter - xml +- xmlreader - xmlwriter - yaf - yaml +- zend opcache - zip - zlib ``` Read more about From d96c9abf00eac8ac36f048b7bddca4da72388149 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 22 Dec 2019 16:31:07 +0700 Subject: [PATCH 030/311] docs: reference lemp --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b682235..2407a07 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ Docker PHP FPM with lean alpine base. The download size is just about 90MB. It contains PHP7.4.1 with plenty of common and useful extensions. +If you are looking for a complete local development stack then check +[`adhocore/lemp`](https://github.com/adhocore/docker-lemp). + ## Usage To pull latest image: From bc2cb9ebca2479fa23d2dad4a1cec78d258b7712 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 31 Dec 2019 05:33:16 +0700 Subject: [PATCH 031/311] chore: bump phalcon to 4.0.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f47ee0a..dcacdc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari ENV \ XHPROF_VERSION=5.0.1 \ - PHALCON_VERSION=4.0.0-rc.3 \ + PHALCON_VERSION=4.0.0 \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ From 865fb1226ac02b1e66829c080ce0011e9d8c5420 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 1 Jan 2020 14:01:35 +0700 Subject: [PATCH 032/311] feat: add zephir_parser --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcacdc2..e8ac632 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM php:7.4.1-fpm-alpine3.10 MAINTAINER Jitendra Adhikari ENV \ - XHPROF_VERSION=5.0.1 \ + XHPROF_VERSION=5.0.1\ + ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.0 \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ @@ -11,7 +12,7 @@ ENV \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip" + soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" RUN \ # deps @@ -37,6 +38,11 @@ RUN \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ + # zephir_parser + && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + && tar xzf zephir_parser.tar.gz \ + && rm -f zephir_parser.tar.gz \ + && mv php-zephir-parer-$ZEPHIR_VERSION zephir_parser \ && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ From d800cfc87e06050cfc559dc3e03e6f7eab92e380 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 1 Jan 2020 14:03:05 +0700 Subject: [PATCH 033/311] docs: zephir parser --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2407a07..555a2c0 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ The following PHP extensions are installed: - sysvshm - tideways_xhprof - tidy - tokenizer - uuid - xdebug - xlswriter - xml - xmlreader - xmlwriter - yaf - yaml -- zend opcache - zip - zlib +- zend opcache - zephir_parser - zip - zlib ``` Read more about From ee72d65889105300b45fac6ad9907fd538e4c3c0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 1 Jan 2020 14:18:53 +0700 Subject: [PATCH 034/311] chore: show extensions after build --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e8ac632..46ca77b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,4 +72,6 @@ RUN \ # docker-php-ext-disable COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +# ext COPY ext.php /ext.php +RUN php -f /ext.php From 1e5029178be6e4c7fa66b54795618f997d7c3b0d Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 1 Jan 2020 18:48:18 +0700 Subject: [PATCH 035/311] fix: typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 46ca77b..9d5db69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN \ && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ && tar xzf zephir_parser.tar.gz \ && rm -f zephir_parser.tar.gz \ - && mv php-zephir-parer-$ZEPHIR_VERSION zephir_parser \ + && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ From 72e6d20e17cd44ae93604a3d8f78a0f4ef31a11e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 22:16:44 +0000 Subject: [PATCH 036/311] chore(deps): bump php from 7.4.1-fpm-alpine3.10 to 7.4.2-fpm-alpine3.10 Bumps php from 7.4.1-fpm-alpine3.10 to 7.4.2-fpm-alpine3.10. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d5db69..8349733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.1-fpm-alpine3.10 +FROM php:7.4.2-fpm-alpine3.10 MAINTAINER Jitendra Adhikari From b418b0c69a94ff28d924e02664d1533d0a445bdf Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 27 Jan 2020 07:49:48 +0700 Subject: [PATCH 037/311] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 555a2c0..98b330b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about 90MB. -It contains PHP7.4.1 with plenty of common and useful extensions. +It contains PHP7.4.2 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 7977222b52d28683dab3f3ba7751c787d4120310 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2020 22:16:55 +0000 Subject: [PATCH 038/311] chore(deps): bump php from 7.4.2-fpm-alpine3.10 to 7.4.3-fpm-alpine3.10 Bumps php from 7.4.2-fpm-alpine3.10 to 7.4.3-fpm-alpine3.10. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8349733..112e183 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.2-fpm-alpine3.10 +FROM php:7.4.3-fpm-alpine3.10 MAINTAINER Jitendra Adhikari From 08cb2ad8768b0bc8dfef2599a00865b6899a55a5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 18 Mar 2020 22:21:27 +0700 Subject: [PATCH 039/311] docs: update PHP version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98b330b..24bf2e8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about 90MB. -It contains PHP7.4.2 with plenty of common and useful extensions. +It contains PHP7.4.3 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 4f9baa945c398c9a73f5a5d2b542db2be4c81c1d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 22:16:04 +0000 Subject: [PATCH 040/311] chore(deps): bump php from 7.4.3-fpm-alpine3.10 to 7.4.4-fpm-alpine3.10 Bumps php from 7.4.3-fpm-alpine3.10 to 7.4.4-fpm-alpine3.10. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 112e183..9b120c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.3-fpm-alpine3.10 +FROM php:7.4.4-fpm-alpine3.10 MAINTAINER Jitendra Adhikari From 79e5d6681362d2d98bc90b35c9753688232b623a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 21 Mar 2020 05:43:10 +0700 Subject: [PATCH 041/311] feat: add composer booster prestissimo --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9b120c5..5169b3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,7 @@ RUN \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && composer global require hirak/prestissimo \ # # cleanup && apk del temp \ From e00dc22757ff6b2a8f1fd2460094db1d1f296034 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 26 Mar 2020 07:58:37 +0700 Subject: [PATCH 042/311] docs: update PHP version, download size --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24bf2e8..9c2836f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ## docker-phpfpm -Docker PHP FPM with lean alpine base. The download size is just about 90MB. +Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.3 with plenty of common and useful extensions. +It contains PHP7.4.4 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 200cd9f510f8d6c02169b41c11771ed4a1b0b3b1 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 17 Apr 2020 23:56:42 +0700 Subject: [PATCH 043/311] docs: 7.4.5 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c2836f..97c36ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.4 with plenty of common and useful extensions. +It contains PHP7.4.5 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 1081c1bc44165f6347a0ba20e8fd697b634f2586 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 17 Apr 2020 23:57:46 +0700 Subject: [PATCH 044/311] feat: php 7.4.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5169b3c..91d502d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.4-fpm-alpine3.10 +FROM php:7.4.5-fpm-alpine3.10 MAINTAINER Jitendra Adhikari From a526a9b5d047b9e6d35f9f9ee9bac4b42a4c4624 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 18 Apr 2020 00:01:34 +0700 Subject: [PATCH 045/311] feat: alpine 3.11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 91d502d..55c4ce7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.5-fpm-alpine3.10 +FROM php:7.4.5-fpm-alpine3.11 MAINTAINER Jitendra Adhikari From 46427189b4ae7e286c52d168926996d0d176df81 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 22:16:27 +0000 Subject: [PATCH 046/311] chore(deps): bump php from 7.4.5-fpm-alpine3.11 to 7.4.6-fpm-alpine3.11 Bumps php from 7.4.5-fpm-alpine3.11 to 7.4.6-fpm-alpine3.11. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 55c4ce7..b1d649b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.5-fpm-alpine3.11 +FROM php:7.4.6-fpm-alpine3.11 MAINTAINER Jitendra Adhikari From 60b76522109c9c17730ce8038b39fff37fafed7d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:18:45 +0000 Subject: [PATCH 047/311] chore(deps): bump php from 7.4.6-fpm-alpine3.11 to 7.4.7-fpm-alpine3.11 Bumps php from 7.4.6-fpm-alpine3.11 to 7.4.7-fpm-alpine3.11. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1d649b..1fad0fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.6-fpm-alpine3.11 +FROM php:7.4.7-fpm-alpine3.11 MAINTAINER Jitendra Adhikari From 010a8f59d6c54bad527e2fd8ad68a4c9cff31809 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 13 Jun 2020 06:02:06 +0700 Subject: [PATCH 048/311] docs: update php version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97c36ef..578ba19 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.5 with plenty of common and useful extensions. +It contains PHP7.4.7 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 7a7094d270363d7b2af195b671378557157d2932 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:18:52 +0000 Subject: [PATCH 049/311] chore(deps): bump php from 7.4.7-fpm-alpine3.11 to 7.4.8-fpm-alpine3.11 Bumps php from 7.4.7-fpm-alpine3.11 to 7.4.8-fpm-alpine3.11. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1fad0fa..9fc5cc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.7-fpm-alpine3.11 +FROM php:7.4.8-fpm-alpine3.11 MAINTAINER Jitendra Adhikari From 872fd76695936ea31bc5e65631aa746344392a85 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 11 Jul 2020 09:25:55 +0700 Subject: [PATCH 050/311] docs: bump php version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 578ba19..44343f5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.7 with plenty of common and useful extensions. +It contains PHP7.4.8 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From e630baf027e982655516977ed40446cd45fa8498 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 11 Jul 2020 09:28:36 +0700 Subject: [PATCH 051/311] chore: bump alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9fc5cc1..9f26906 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.8-fpm-alpine3.11 +FROM php:7.4.8-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From d42c53fd36e34ce06612878ac6758bea17e36785 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 22:23:21 +0000 Subject: [PATCH 052/311] chore(deps): bump php from 7.4.8-fpm-alpine3.12 to 7.4.9-fpm-alpine3.12 Bumps php from 7.4.8-fpm-alpine3.12 to 7.4.9-fpm-alpine3.12. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f26906..4eb1479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.8-fpm-alpine3.12 +FROM php:7.4.9-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From c19bd404d957538000e6a7b29c8df58b3c834ce4 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 12 Aug 2020 22:37:29 +0700 Subject: [PATCH 053/311] docs: update version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 44343f5..041957d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.8 with plenty of common and useful extensions. +It contains PHP7.4.9 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 0003897d98f264315e2ab3cf640b47c40b156ade Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Aug 2020 10:28:42 +0700 Subject: [PATCH 054/311] feat: add pickle based ext installer --- docker-pickle-ext-install.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 docker-pickle-ext-install.sh diff --git a/docker-pickle-ext-install.sh b/docker-pickle-ext-install.sh new file mode 100755 index 0000000..ac6bc46 --- /dev/null +++ b/docker-pickle-ext-install.sh @@ -0,0 +1,34 @@ +#!/bin/sh +set -e + +usage() { + echo "usage: $0 [options] module-name [module-name ...]" + echo " ie: $0 apcu" + echo " $0 apcu redis" + echo + + exit 1 +} + + +modules= +for module; do + [[ "$module" == "--help" ]] \ + || [[ "$module" == "-h" ]] \ + && usage >&2 + [[ -n "$modules" ]] \ + && modules="$modules $module" \ + || modules="$module" +done + +[[ -n "$module" ]] || usage >&2 + +if ! command -v pickle &> /dev/null; then + echo "Installing pickle" + curl -sSLo /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar + chmod +x /usr/local/bin/pickle +fi + +for module in $modules; do + pickle install -n --defaults $module +done From 4fb43e31ac75ed0bd85c8f23d4c5f3f87cee9f88 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Aug 2020 10:44:22 +0700 Subject: [PATCH 055/311] build(docker): add php8 with exts, comment unsupported exts --- Dockerfile | 80 ++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4eb1479..9bb21bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,66 +1,67 @@ -FROM php:7.4.9-fpm-alpine3.12 +FROM php:8.0.0beta1-fpm-alpine3.12 MAINTAINER Jitendra Adhikari ENV \ - XHPROF_VERSION=5.0.1\ + XHPROF_VERSION=5.0.1 \ ZEPHIR_VERSION=1.3.3 \ - PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.4.12 \ + PHALCON_VERSION=4.0.6 \ + SWOOLE_VERSION=4.5.2 \ MAXMIND_VERSION=1.4.2 \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ - ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ - PECL_BUNDLE="memcached event" \ + PECL_EXTENSIONS_FUTURE="ds ev event hrtime imagick lua mongodb msgpack oauth redis ssh2-1.2 xdebug xlswriter yaf yaml" \ + PECL_EXTENSIONS="apcu ast igbinary lzf memcached pcov psr uuid" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" + pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" + +# docker-php-ext-disable +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +COPY docker-pickle-ext-install.sh /usr/local/bin/docker-pickle-ext-install RUN \ # deps apk add -U --no-cache --virtual temp \ # dev deps - autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev libxslt-dev \ # prod deps - && apk add --no-cache icu gettext imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ + && apk add --no-cache aspell gettext icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ # # php extensions && docker-php-source extract \ - && pecl channel-update pecl.php.net \ - && pecl install $PECL_EXTENSIONS \ - && cd /usr/src/php/ext/ \ - && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ + && docker-php-ext-install $PHP_EXTENSIONS \ + && docker-pickle-ext-install $PECL_EXTENSIONS \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + #&& cd /usr/src/php/ext/ \ # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ + #&& curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v4.4.16.tar.gz \ + # && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-4.4.16 swoole_async \ + # && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser - && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ - && tar xzf zephir_parser.tar.gz \ - && rm -f zephir_parser.tar.gz \ - && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ - && cd /usr/local/etc/php/conf.d/ \ - && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ - && pecl clear-cache \ + #&& curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + # && tar xzf zephir_parser.tar.gz \ + # && rm -f zephir_parser.tar.gz \ + # && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ + #&& docker-php-ext-install -j "$(nproc)" swoole swoole_async zephir_parser \ + #&& cd /usr/local/etc/php/conf.d/ \ + # && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ && docker-php-source delete \ # # tideways_xhprof - && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ - && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ - && phpize && ./configure \ - && make -j "$(nproc)" && make install \ - && docker-php-ext-enable tideways_xhprof \ + #&& curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + # && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ + # && phpize && ./configure \ + # && make -j "$(nproc)" && make install \ + # && docker-php-ext-enable tideways_xhprof \ # # phalcon - && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ - && cd /tmp/ && tar xzf phalcon.tar.gz \ - && cd cphalcon-$PHALCON_VERSION/build && sh install \ - && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ + #&& curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + # && cd /tmp/ && tar xzf phalcon.tar.gz \ + # && cd cphalcon-$PHALCON_VERSION/build && sh install \ + # && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ @@ -70,9 +71,6 @@ RUN \ && apk del temp \ && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* -# docker-php-ext-disable -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable - # ext COPY ext.php /ext.php RUN php -f /ext.php From 3ad8a131b8740d11c04dfde22f163a06a5fef07a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Aug 2020 10:44:50 +0700 Subject: [PATCH 056/311] docs: update for 8.0 --- README.md | 55 +++++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 041957d..12edc21 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP7.4.9 with plenty of common and useful extensions. +It contains PHP8.0beta with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -11,7 +11,7 @@ If you are looking for a complete local development stack then check To pull latest image: ```sh -docker pull adhocore/phpfpm:7.4 +docker pull adhocore/phpfpm:8.0b ``` To use in docker-compose @@ -21,7 +21,7 @@ version: '3' services: phpfpm: - image: adhocore/phpfpm:7.4 + image: adhocore/phpfpm:8.0b container_name: phpfpm volumes: # Here you can also volume php ini settings @@ -39,44 +39,27 @@ The following PHP extensions are installed: ``` - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl -- date - dom - ds - ev -- event - exif - fileinfo - filter -- ftp - gd - gettext - gmp -- hash - hrtime - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lua - lzf -- mbstring - memcached - mongodb - msgpack -- mysqli - mysqlnd - oauth - openssl -- pcntl - pcov - pcre - pdo -- pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql -- phalcon - phar - posix - psr -- readline - redis - reflection - session -- simplexml - soap - sockets - sodium -- spl - sqlite3 - ssh2 - standard -- swoole - swoole_async - sysvmsg - sysvsem -- sysvshm - tideways_xhprof - tidy - tokenizer -- uuid - xdebug - xlswriter - xml -- xmlreader - xmlwriter - yaf - yaml -- zend opcache - zephir_parser - zip - zlib +- date - dom - exif - fileinfo +- filter - ftp - gd - gettext +- gmp - hash - iconv - igbinary +- imap - intl - json - ldap +- libxml - lzf - mbstring - memcached +- mysqli - mysqlnd - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phar +- posix - pspell - psr - readline +- reflection - session - shmop - simplexml +- soap - sockets - sodium - spl +- sqlite3 - standard - sysvmsg - sysvsem +- sysvshm - tidy - tokenizer - uuid +- xml - xmlreader - xmlwriter - xsl +- zend opcache - zip - zlib ``` Read more about [pcov](https://github.com/krakjoe/pcov), -[phalcon](https://github.com/phalcon/cphalcon), [psr](https://github.com/jbboehr/php-psr), -[swoole](https://www.swoole.co.uk/), -[xhprof](https://github.com/tideways/php-xhprof-extension) ### Production Usage -For production you may want to get rid of some extensions that are not really required. -In such case, you can build a custom image on top `adhocore/phpfpm:7.4` like so: - -```Dockerfile -FROM adhocore/phpfpm:7.4 - -# Disable extensions you won't need. You can add as much as you want separated by space. -RUN docker-php-ext-disable xdebug pcov -``` - -> `docker-php-ext-disable` is shell script available in `adhocore/phpfpm:7.4` only and not in official PHP docker images. +Not yet ready for production usage. From 3540015fd9520c382c3fdea0b36be7a2b38791d6 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Aug 2020 11:00:15 +0700 Subject: [PATCH 057/311] docs: add refs --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 12edc21..ef8208f 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. It contains PHP8.0beta with plenty of common and useful extensions. +This version of PHP is not yet production ready. +You can still continue using [`adhocore/phpfpm:7.4`](https://github.com/adhocore/docker-phpfpm/tree/7.4) in production. + If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From cad885075116a8e0cebc87ed7a55efe21ebf906f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 4 Sep 2020 10:41:33 +0700 Subject: [PATCH 058/311] build(docker): bump php version, add/preload gnu libiconv --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9bb21bb..2ecaaa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0beta1-fpm-alpine3.12 +FROM php:8.0.0beta3-fpm-alpine3.12 MAINTAINER Jitendra Adhikari @@ -6,15 +6,18 @@ ENV \ XHPROF_VERSION=5.0.1 \ ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.6 \ - SWOOLE_VERSION=4.5.2 \ + SWOOLE_VERSION=4.5.3 \ + SWOOLE_ASYNC_VERSION=4.4.16 \ MAXMIND_VERSION=1.4.2 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ds ev event hrtime imagick lua mongodb msgpack oauth redis ssh2-1.2 xdebug xlswriter yaf yaml" \ PECL_EXTENSIONS="apcu ast igbinary lzf memcached pcov psr uuid" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" -# docker-php-ext-disable +# docker-php-ext-* COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +# COPY pickle.phar /usr/local/bin/pickle COPY docker-pickle-ext-install.sh /usr/local/bin/docker-pickle-ext-install RUN \ @@ -25,20 +28,20 @@ RUN \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev libxslt-dev \ # prod deps - && apk add --no-cache aspell gettext icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ # # php extensions && docker-php-source extract \ - && docker-php-ext-install $PHP_EXTENSIONS \ - && docker-pickle-ext-install $PECL_EXTENSIONS \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ + && docker-pickle-ext-install $PECL_EXTENSIONS > /dev/null \ + && docker-php-ext-enable opcache \ #&& cd /usr/src/php/ext/ \ # swoole #&& curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v4.4.16.tar.gz \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-4.4.16 swoole_async \ + # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ # && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser #&& curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ From f77c232a75c44c51c016a5daf40e46f0e0795eb3 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 4 Sep 2020 10:42:20 +0700 Subject: [PATCH 059/311] refactor(pickle): skip if already installed, enable after install --- docker-pickle-ext-install.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker-pickle-ext-install.sh b/docker-pickle-ext-install.sh index ac6bc46..c6a1dab 100755 --- a/docker-pickle-ext-install.sh +++ b/docker-pickle-ext-install.sh @@ -1,4 +1,5 @@ #!/bin/sh + set -e usage() { @@ -13,12 +14,8 @@ usage() { modules= for module; do - [[ "$module" == "--help" ]] \ - || [[ "$module" == "-h" ]] \ - && usage >&2 - [[ -n "$modules" ]] \ - && modules="$modules $module" \ - || modules="$module" + [[ "$module" == "--help" ]] || [[ "$module" == "-h" ]] && usage >&2 + [[ -n "$modules" ]] && modules="$modules $module" || modules="$module" done [[ -n "$module" ]] || usage >&2 @@ -30,5 +27,6 @@ if ! command -v pickle &> /dev/null; then fi for module in $modules; do - pickle install -n --defaults $module + (php -m | grep -q $module && echo "$module already installed") \ + || (pickle install -n --defaults $module && docker-php-ext-enable $module > /dev/null) done From d0d5d39f709178c1e659ba15e97c022bf4702209 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 18 Sep 2020 21:38:52 +0700 Subject: [PATCH 060/311] build(docker): bump to beta 4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ecaaa9..14fdf62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0beta3-fpm-alpine3.12 +FROM php:8.0.0beta4-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 32c391ef403598c83942ca5ccaf812875d9fc0a3 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 5 Oct 2020 08:36:21 +0700 Subject: [PATCH 061/311] feat: bump to 8.0 rc1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14fdf62..54ed5d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0beta4-fpm-alpine3.12 +FROM php:8.0.0rc1-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From a9606ca537f28d57ea9fdd829084a02d89b1f095 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Oct 2020 06:38:25 +0700 Subject: [PATCH 062/311] docs: update to rc --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ef8208f..f05c6a7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0beta with plenty of common and useful extensions. +It contains PHP8.0rc with plenty of common and useful extensions. This version of PHP is not yet production ready. You can still continue using [`adhocore/phpfpm:7.4`](https://github.com/adhocore/docker-phpfpm/tree/7.4) in production. @@ -14,7 +14,7 @@ If you are looking for a complete local development stack then check To pull latest image: ```sh -docker pull adhocore/phpfpm:8.0b +docker pull adhocore/phpfpm:8.0rc ``` To use in docker-compose @@ -24,7 +24,7 @@ version: '3' services: phpfpm: - image: adhocore/phpfpm:8.0b + image: adhocore/phpfpm:8.0rc container_name: phpfpm volumes: # Here you can also volume php ini settings From ec9e1d4bd2dbd2eeb3bd311c3cd95e871e6b176a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 17 Oct 2020 07:30:00 +0700 Subject: [PATCH 063/311] feat: bump to rc2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54ed5d6..d94918e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0rc1-fpm-alpine3.12 +FROM php:8.0.0RC2-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 5d8be7e51712db7c27fe896dec17e13e952d7b94 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 22 Oct 2020 19:22:20 +0700 Subject: [PATCH 064/311] feat: activate redis --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d94918e..4a29ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ ENV \ SWOOLE_ASYNC_VERSION=4.4.16 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ds ev event hrtime imagick lua mongodb msgpack oauth redis ssh2-1.2 xdebug xlswriter yaf yaml" \ - PECL_EXTENSIONS="apcu ast igbinary lzf memcached pcov psr uuid" \ + PECL_EXTENSIONS_FUTURE="ds ev event hrtime imagick lua mongodb msgpack oauth ssh2-1.2 xdebug xlswriter yaf yaml" \ + PECL_EXTENSIONS="apcu ast igbinary lzf memcached pcov psr redis uuid" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From eab8f96cb978e0d06e365645fde168ada61bdc16 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 22 Oct 2020 19:49:35 +0700 Subject: [PATCH 065/311] docs: add redis to extensions --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f05c6a7..4ffc1da 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,12 @@ The following PHP extensions are installed: - pcov - pcre - pdo - pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql - phar - posix - pspell - psr - readline -- reflection - session - shmop - simplexml -- soap - sockets - sodium - spl -- sqlite3 - standard - sysvmsg - sysvsem -- sysvshm - tidy - tokenizer - uuid -- xml - xmlreader - xmlwriter - xsl -- zend opcache - zip - zlib +- redis - reflection - session - shmop +- simplexml - soap - sockets - sodium +- spl - sqlite3 - standard - sysvmsg +- sysvsem - sysvshm. - tidy. - tokenizer +- uuid - xml - xmlreader - xmlwriter +- xsl - zend opcache - zip - zlib ``` Read more about From 1420a58e9977ea61da91cf40ae8d42d54bd8b21f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 30 Oct 2020 09:35:48 +0700 Subject: [PATCH 066/311] feat: bump to rc3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4a29ad0..39a2b13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0RC2-fpm-alpine3.12 +FROM php:8.0.0RC3-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From d4476fd900095b48694bfc29898672aa15991277 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 31 Oct 2020 12:29:12 +0700 Subject: [PATCH 067/311] chore: disable prestissimo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39a2b13..0f04483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,7 +68,7 @@ RUN \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ - && composer global require hirak/prestissimo \ +# && composer global require hirak/prestissimo \ # # cleanup && apk del temp \ From a69ae7aa2cfa8cb1f909012731652fa2a4f022df Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 31 Oct 2020 12:29:53 +0700 Subject: [PATCH 068/311] docs: update php version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ffc1da..38ef2d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0rc with plenty of common and useful extensions. +It contains PHP8.0rc3 with plenty of common and useful extensions. This version of PHP is not yet production ready. You can still continue using [`adhocore/phpfpm:7.4`](https://github.com/adhocore/docker-phpfpm/tree/7.4) in production. From b5420fb71911b1c4955ad0b39a9db1bb19772773 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 14 Nov 2020 07:46:16 +0700 Subject: [PATCH 069/311] feat: bump to php 8.0rc4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f04483..3987701 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0RC3-fpm-alpine3.12 +FROM php:8.0.0RC4-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 450d1952e87fd85ff9af40a03fe3b1478d86eaf1 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 20 Nov 2020 16:11:28 +0700 Subject: [PATCH 070/311] feat: bump to 8.0rc5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3987701..a4f19f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0RC4-fpm-alpine3.12 +FROM php:8.0.0RC5-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 106756213034564350fe3cf83d397f959615e777 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 27 Nov 2020 07:18:20 +0700 Subject: [PATCH 071/311] feat: bump to php 8.0.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4f19f8..cb35bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0RC5-fpm-alpine3.12 +FROM php:8.0.0-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From a5a922402c267baf446bcf16ba1f54c9224ee9b0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 2 Dec 2020 22:39:48 +0700 Subject: [PATCH 072/311] Update README.md --- README.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 38ef2d1..8038510 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0rc3 with plenty of common and useful extensions. +It contains PHP8.0.0 with plenty of common and useful extensions. -This version of PHP is not yet production ready. -You can still continue using [`adhocore/phpfpm:7.4`](https://github.com/adhocore/docker-phpfpm/tree/7.4) in production. +You can also continue using [`adhocore/phpfpm:7.4`]( +https://github.com/adhocore/docker-phpfpm/tree/7.4). If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -14,7 +14,7 @@ If you are looking for a complete local development stack then check To pull latest image: ```sh -docker pull adhocore/phpfpm:8.0rc +docker pull adhocore/phpfpm:8.0 ``` To use in docker-compose @@ -24,7 +24,7 @@ version: '3' services: phpfpm: - image: adhocore/phpfpm:8.0rc + image: adhocore/phpfpm:8.0 container_name: phpfpm volumes: # Here you can also volume php ini settings @@ -61,8 +61,4 @@ The following PHP extensions are installed: Read more about [pcov](https://github.com/krakjoe/pcov), -[psr](https://github.com/jbboehr/php-psr), - -### Production Usage - -Not yet ready for production usage. +[psr](https://github.com/jbboehr/php-psr) From 3f736cf03b2770b26f2b3670d30b6e22772ea5a2 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 3 Dec 2020 08:57:23 +0700 Subject: [PATCH 073/311] docs: add vol map for app --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8038510..0846e10 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ services: image: adhocore/phpfpm:8.0 container_name: phpfpm volumes: + - ./path/to/your/app:/var/www/html # Here you can also volume php ini settings # - /path/to/zz-overrides:/usr/local/etc/php/conf.d/zz-overrides.ini ports: From 1ab2551fbcfae8f4969a84c461b7fc78300cf482 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 5 Dec 2020 08:25:40 +0700 Subject: [PATCH 074/311] chore: add count in /ext.php --- ext.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext.php b/ext.php index edb824a..c0f4c1e 100644 --- a/ext.php +++ b/ext.php @@ -2,6 +2,8 @@ $ex = array_map('strtolower', get_loaded_extensions()); +echo 'Total: ', count($ex), "\n"; + sort($ex); foreach (array_chunk($ex, 4) as $ee) { foreach ($ee as $e) { From a9410f45ce53e29502632a36443718cec36e3fb0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 5 Dec 2020 08:26:13 +0700 Subject: [PATCH 075/311] feat(dockerfile): add more extensions, remove unsupported ones --- Dockerfile | 55 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb35bb2..f8b2ce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,22 +3,17 @@ FROM php:8.0.0-fpm-alpine3.12 MAINTAINER Jitendra Adhikari ENV \ - XHPROF_VERSION=5.0.1 \ - ZEPHIR_VERSION=1.3.3 \ - PHALCON_VERSION=4.0.6 \ - SWOOLE_VERSION=4.5.3 \ - SWOOLE_ASYNC_VERSION=4.4.16 \ MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.5.9 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ds ev event hrtime imagick lua mongodb msgpack oauth ssh2-1.2 xdebug xlswriter yaf yaml" \ - PECL_EXTENSIONS="apcu ast igbinary lzf memcached pcov psr redis uuid" \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" # docker-php-ext-* COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable -# COPY pickle.phar /usr/local/bin/pickle -COPY docker-pickle-ext-install.sh /usr/local/bin/docker-pickle-ext-install RUN \ # deps @@ -34,41 +29,21 @@ RUN \ # php extensions && docker-php-source extract \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && docker-pickle-ext-install $PECL_EXTENSIONS > /dev/null \ - && docker-php-ext-enable opcache \ - #&& cd /usr/src/php/ext/ \ + && pecl $PECL_EXTENSIONS > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && cd /usr/src/php/ext/ \ # swoole - #&& curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - # && rm -f swoole.tar.gz swoole_async.tar.gz \ - # zephir_parser - #&& curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ - # && tar xzf zephir_parser.tar.gz \ - # && rm -f zephir_parser.tar.gz \ - # && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ - #&& docker-php-ext-install -j "$(nproc)" swoole swoole_async zephir_parser \ - #&& cd /usr/local/etc/php/conf.d/ \ - # && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + && docker-php-ext-install -j "$(nproc)" swoole \ && docker-php-source delete \ # -# tideways_xhprof - #&& curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ - # && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ - # && phpize && ./configure \ - # && make -j "$(nproc)" && make install \ - # && docker-php-ext-enable tideways_xhprof \ -# -# phalcon - #&& curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ - # && cd /tmp/ && tar xzf phalcon.tar.gz \ - # && cd cphalcon-$PHALCON_VERSION/build && sh install \ - # && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ -# # composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ -# && composer global require hirak/prestissimo \ + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ # # cleanup && apk del temp \ From 0f46424ac2f8292e0807749b8c134a73be9198cf Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 5 Dec 2020 10:18:37 +0700 Subject: [PATCH 076/311] fix: apcu not ready yet --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8b2ce6..2d02684 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ ENV \ SWOOLE_VERSION=4.5.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ + PECL_EXTENSIONS_FUTURE="apcu ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From 6dff5bbdd3d283e4b7b54bf4d9542a0ac31fc556 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 5 Dec 2020 19:35:52 +0700 Subject: [PATCH 077/311] fix: ast not ready yet --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d02684..de88d0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ ENV \ SWOOLE_VERSION=4.5.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="apcu ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ + PECL_EXTENSIONS_FUTURE="apcu ast ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From 20fc93bb397b98f326f16f05d67297abf3dabc80 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 6 Dec 2020 06:00:32 +0700 Subject: [PATCH 078/311] fix: pecl install --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index de88d0d..2b0ff62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ ENV \ SWOOLE_VERSION=4.5.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="apcu ast ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -29,7 +29,7 @@ RUN \ # php extensions && docker-php-source extract \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && pecl $PECL_EXTENSIONS > /dev/null \ + && pecl install $PECL_EXTENSIONS > /dev/null \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ && cd /usr/src/php/ext/ \ # swoole From 9988a64119ffd0f0148a4dcf7d637bb5e104a7f3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 8 Jan 2021 22:17:02 +0000 Subject: [PATCH 079/311] chore(deps): bump php from 8.0.0-fpm-alpine3.12 to 8.0.1-fpm-alpine3.12 Bumps php from 8.0.0-fpm-alpine3.12 to 8.0.1-fpm-alpine3.12. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b0ff62..7138930 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.0-fpm-alpine3.12 +FROM php:8.0.1-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 27e2f0a94d422ab4c48568a765269104c921ae37 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 31 Jan 2021 06:23:00 +0700 Subject: [PATCH 080/311] feat: bump alpine to 3.13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7138930..d706cc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.1-fpm-alpine3.12 +FROM php:8.0.1-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 36e74c2d7109719891cc96789af74ab5397ec32c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 22:16:46 +0000 Subject: [PATCH 081/311] chore(deps): bump php from 8.0.1-fpm-alpine3.13 to 8.0.2-fpm-alpine3.13 Bumps php from 8.0.1-fpm-alpine3.13 to 8.0.2-fpm-alpine3.13. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d706cc2..49ee866 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.1-fpm-alpine3.13 +FROM php:8.0.2-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 8f084b9daa05c0e79730ce80950e004fcec254f8 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 6 Feb 2021 15:29:15 +0700 Subject: [PATCH 082/311] feat: add xhprof --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49ee866..8e526c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug yaml" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From 2a10e972e365bc6f30cdf169517ae707d4709476 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 6 Feb 2021 15:29:48 +0700 Subject: [PATCH 083/311] fix(ext-disable): do not match '.so' --- docker-php-ext-disable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-php-ext-disable.sh b/docker-php-ext-disable.sh index 885c850..0faf39c 100755 --- a/docker-php-ext-disable.sh +++ b/docker-php-ext-disable.sh @@ -25,8 +25,8 @@ for module; do || [[ "$module" == "-h" ]] \ && usage >&2 [[ -n "$modules" ]] \ - && modules="$modules|(=|\/)$module.so" \ - || modules="(=|\/)$module.so" + && modules="$modules|(=|\/)$module" \ + || modules="(=|\/)$module" done [[ -n "$modules" ]] \ From cebea946abca14bc90053f9c381dfa0ed37969ce Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 6 Feb 2021 15:32:05 +0700 Subject: [PATCH 084/311] unfeat: downgrade alpine to 3.12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e526c0..3e45b37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.2-fpm-alpine3.13 +FROM php:8.0.2-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 0d5dc4423dfca155b09b9215a3a1614e0876ac79 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 6 Feb 2021 15:41:03 +0700 Subject: [PATCH 085/311] docs: alpine 3.13 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0846e10..31bf300 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,9 @@ To pull latest image: ```sh docker pull adhocore/phpfpm:8.0 + +# or for alpine 3.13 +docker pull adhocore/phpfpm:8.0-alp3.13 ``` To use in docker-compose From 70d7954ade80b961b74fc3c8563a3c1f37b2f3f9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 12 Feb 2021 17:34:10 +0700 Subject: [PATCH 086/311] docs: add prod usage info --- README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 31bf300..b1c8c27 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ The following PHP extensions are installed: - redis - reflection - session - shmop - simplexml - soap - sockets - sodium - spl - sqlite3 - standard - sysvmsg -- sysvsem - sysvshm. - tidy. - tokenizer +- sysvsem - sysvshm - tidy - tokenizer - uuid - xml - xmlreader - xmlwriter - xsl - zend opcache - zip - zlib ``` @@ -66,3 +66,17 @@ The following PHP extensions are installed: Read more about [pcov](https://github.com/krakjoe/pcov), [psr](https://github.com/jbboehr/php-psr) + +### Production Usage + +For production you may want to get rid of some extensions that are not really required. +In such case, you can build a custom image on top `adhocore/phpfpm:8.0` like so: + +```Dockerfile +FROM adhocore/phpfpm:8.0 + +# Disable extensions you won't need. You can add as much as you want separated by space. +RUN docker-php-ext-disable xdebug pcov ldap +``` + +> `docker-php-ext-disable` is shell script available in `adhocore/phpfpm:8.0` only and not in official PHP docker images. From 54da87988db15f42bdecd7d2e0e784fe2f4e7101 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Mar 2021 22:19:18 +0000 Subject: [PATCH 087/311] chore(deps): bump php from 8.0.2-fpm-alpine3.12 to 8.0.3-fpm-alpine3.12 Bumps php from 8.0.2-fpm-alpine3.12 to 8.0.3-fpm-alpine3.12. Signed-off-by: dependabot-preview[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e45b37..8a85c84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.2-fpm-alpine3.12 +FROM php:8.0.3-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From cfaec07ccc8ce6814d284ee63415550597c0dd81 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sat, 6 Mar 2021 15:31:04 +0700 Subject: [PATCH 088/311] docs: update PHP version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1c8c27..ab4bb98 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0.0 with plenty of common and useful extensions. +It contains PHP8.0.3 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`]( https://github.com/adhocore/docker-phpfpm/tree/7.4). From 69698a48df58b1dec82a85e4d04426c7714e0d66 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 27 Mar 2021 15:56:15 +0700 Subject: [PATCH 089/311] docs: update extensions --- README.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ab4bb98..2df38a5 100644 --- a/README.md +++ b/README.md @@ -44,23 +44,26 @@ services: The following PHP extensions are installed: ``` +Total: 76 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl -- date - dom - exif - fileinfo -- filter - ftp - gd - gettext -- gmp - hash - iconv - igbinary -- imap - intl - json - ldap -- libxml - lzf - mbstring - memcached -- mysqli - mysqlnd - openssl - pcntl +- date - dom - ds - exif +- fileinfo - filter - ftp - gd +- gettext - gmp - hash - iconv +- igbinary - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl - pcov - pcre - pdo - pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql - phar - posix - pspell - psr - readline - redis - reflection - session - shmop - simplexml - soap - sockets - sodium -- spl - sqlite3 - standard - sysvmsg -- sysvsem - sysvshm - tidy - tokenizer -- uuid - xml - xmlreader - xmlwriter -- xsl - zend opcache - zip - zlib +- spl - sqlite3 - standard - swoole +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - uuid - xdebug - xhprof +- xml - xmlreader - xmlwriter - xsl +- yaml - zend opcache - zip - zlib ``` Read more about From 12974028da8d594227c86c0c4b50e00c13f2281d Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sun, 28 Mar 2021 09:22:29 +0700 Subject: [PATCH 090/311] chore: add funding [ci skip][skip ci] --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..5ea509b --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: ["https://paypal.me/ji10"] From af40de6f27d170683824e2965d9c0b3638032db7 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sun, 18 Apr 2021 12:19:29 +0700 Subject: [PATCH 091/311] docs: on composer [skip ci] [ci skip] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2df38a5..6e4fca4 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ https://github.com/adhocore/docker-phpfpm/tree/7.4). If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). +It comes prepackaged with `composer` - both v1 and v2. +Use `composer2` command for v2 and `composer` for v1. + ## Usage To pull latest image: From 8af075b5ceb2439cb8d58d47e76be677975488f1 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 24 Apr 2021 08:35:27 +0700 Subject: [PATCH 092/311] docs: badge [skip ci][ci skip] --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 6e4fca4..3941c52 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ ## docker-phpfpm +![Docker Build](https://img.shields.io/docker/cloud/build/adhocore/phpfpm?style=flat-square) +[![Donate](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square)](https://www.paypal.me/ji10/50usd) +[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Production+ready+PHP7+and+PHP8+docker+images+with+plenty+extensions&url=https://github.com/adhocore/docker-phpfpm&hashtags=docker,dockerimage,php7,php8,phpext) + + Docker PHP FPM with lean alpine base. The download size is just about ~100MB. It contains PHP8.0.3 with plenty of common and useful extensions. From 3a0c47c72716cd27bcb1b5a953c605b2abeabecb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:27:12 +0000 Subject: [PATCH 093/311] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..314bf39 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: docker + directory: "/" + schedule: + interval: daily + time: "22:00" + open-pull-requests-limit: 10 From 9b5ec94b698b2003044786e767e3a03c9e868c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 22:11:16 +0000 Subject: [PATCH 094/311] build(deps): bump php from 8.0.3-fpm-alpine3.12 to 8.0.5-fpm-alpine3.12 Bumps php from 8.0.3-fpm-alpine3.12 to 8.0.5-fpm-alpine3.12. Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a85c84..12ee704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.3-fpm-alpine3.12 +FROM php:8.0.5-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From f6575e5f87a10ae4630e12ff0f1f9a52971eb102 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:32:21 +0700 Subject: [PATCH 095/311] docs: bump PHP version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3941c52..e4ad6d1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0.3 with plenty of common and useful extensions. +It contains PHP8.0.5 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`]( https://github.com/adhocore/docker-phpfpm/tree/7.4). From 5a5db5d1fcf45d68c0dbb7dd935c7eef4b0e5fcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 May 2021 22:11:43 +0000 Subject: [PATCH 096/311] build(deps): bump php from 8.0.5-fpm-alpine3.12 to 8.0.6-fpm-alpine3.12 Bumps php from 8.0.5-fpm-alpine3.12 to 8.0.6-fpm-alpine3.12. Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12ee704..3e9bb64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.5-fpm-alpine3.12 +FROM php:8.0.6-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 862c85f9480a13631fa957ad8abd94d47f35c036 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 8 May 2021 08:27:40 +0700 Subject: [PATCH 097/311] docs: bump version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4ad6d1..9bb2451 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. -It contains PHP8.0.5 with plenty of common and useful extensions. +It contains PHP8.0.6 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`]( https://github.com/adhocore/docker-phpfpm/tree/7.4). From 703dae854641a4ed8cf7ded1c98867189341e9d6 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 11:11:23 +0700 Subject: [PATCH 098/311] refactor: Dockerfile -> 8.0.Dockerfile --- Dockerfile => 8.0.Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => 8.0.Dockerfile (100%) diff --git a/Dockerfile b/8.0.Dockerfile similarity index 100% rename from Dockerfile rename to 8.0.Dockerfile From 7d4142566086eb6198cb944c541bf4c1f666e7b7 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 11:13:37 +0700 Subject: [PATCH 099/311] feat: add 8.0-alp3.13.Dockerfile --- 8.0-alp3.13.Dockerfile | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 8.0-alp3.13.Dockerfile diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile new file mode 100644 index 0000000..c3e93e8 --- /dev/null +++ b/8.0-alp3.13.Dockerfile @@ -0,0 +1,54 @@ +FROM php:8.0.6-fpm-alpine3.13 + +MAINTAINER Jitendra Adhikari + +ENV \ + MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.5.9 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug xhprof yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" + +# docker-php-ext-* +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev libxslt-dev \ + # prod deps + && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ +# +# php extensions + && docker-php-source extract \ + && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ + && pecl install $PECL_EXTENSIONS > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && cd /usr/src/php/ext/ \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + && docker-php-ext-install -j "$(nproc)" swoole \ + && docker-php-source delete \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# ext +COPY ext.php /ext.php +RUN php -f /ext.php From 310fb31a99e467dc92384c2631eb8dfd8caca070 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 11:13:52 +0700 Subject: [PATCH 100/311] feat: add 7.4.Dockerfile --- 7.4.Dockerfile | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 7.4.Dockerfile diff --git a/7.4.Dockerfile b/7.4.Dockerfile new file mode 100644 index 0000000..cf7bf1a --- /dev/null +++ b/7.4.Dockerfile @@ -0,0 +1,79 @@ +FROM php:7.4.19-fpm-alpine3.12 + +MAINTAINER Jitendra Adhikari + +ENV \ + XHPROF_VERSION=5.0.1\ + ZEPHIR_VERSION=1.3.3 \ + PHALCON_VERSION=4.0.0 \ + SWOOLE_VERSION=4.4.12 \ + MAXMIND_VERSION=1.4.2 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ + ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ + PECL_BUNDLE="memcached event" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ + # prod deps + && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ +# +# php extensions + && docker-php-source extract \ + && pecl channel-update pecl.php.net \ + && pecl install $PECL_EXTENSIONS \ + && cd /usr/src/php/ext/ \ + && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + # zephir_parser + && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + && tar xzf zephir_parser.tar.gz \ + && rm -f zephir_parser.tar.gz \ + && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ + && cd /usr/local/etc/php/conf.d/ \ + && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ + && pecl clear-cache \ + && docker-php-source delete \ +# +# tideways_xhprof + && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ + && phpize && ./configure \ + && make -j "$(nproc)" && make install \ + && docker-php-ext-enable tideways_xhprof \ +# +# phalcon + && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + && cd /tmp/ && tar xzf phalcon.tar.gz \ + && cd cphalcon-$PHALCON_VERSION/build && sh install \ + && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ +# && composer global require hirak/prestissimo \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# docker-php-ext-disable +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +# ext +COPY ext.php /ext.php +RUN php -f /ext.php From d29cee9022a21c2e146e3bb999a2b8ec45fe542c Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 11:14:06 +0700 Subject: [PATCH 101/311] feat: add 7.4-alp3.13.Dockerfile --- 7.4-alp3.13.Dockerfile | 79 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 7.4-alp3.13.Dockerfile diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile new file mode 100644 index 0000000..f2e8008 --- /dev/null +++ b/7.4-alp3.13.Dockerfile @@ -0,0 +1,79 @@ +FROM php:7.4.19-fpm-alpine3.13 + +MAINTAINER Jitendra Adhikari + +ENV \ + XHPROF_VERSION=5.0.1\ + ZEPHIR_VERSION=1.3.3 \ + PHALCON_VERSION=4.0.0 \ + SWOOLE_VERSION=4.4.12 \ + MAXMIND_VERSION=1.4.2 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ + ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ + PECL_BUNDLE="memcached event" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ + # prod deps + && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ +# +# php extensions + && docker-php-source extract \ + && pecl channel-update pecl.php.net \ + && pecl install $PECL_EXTENSIONS \ + && cd /usr/src/php/ext/ \ + && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + # zephir_parser + && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + && tar xzf zephir_parser.tar.gz \ + && rm -f zephir_parser.tar.gz \ + && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ + && cd /usr/local/etc/php/conf.d/ \ + && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ + && pecl clear-cache \ + && docker-php-source delete \ +# +# tideways_xhprof + && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ + && phpize && ./configure \ + && make -j "$(nproc)" && make install \ + && docker-php-ext-enable tideways_xhprof \ +# +# phalcon + && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + && cd /tmp/ && tar xzf phalcon.tar.gz \ + && cd cphalcon-$PHALCON_VERSION/build && sh install \ + && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ +# && composer global require hirak/prestissimo \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# docker-php-ext-disable +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +# ext +COPY ext.php /ext.php +RUN php -f /ext.php From 18d6bf4fe7a91079b030cef8fd18eed16fa109af Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 11:53:33 +0700 Subject: [PATCH 102/311] feat: add rdkafka php extension --- 7.4-alp3.13.Dockerfile | 6 +++--- 7.4.Dockerfile | 6 +++--- 8.0-alp3.13.Dockerfile | 6 +++--- 8.0.Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index f2e8008..df1d56a 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ @@ -21,10 +21,10 @@ RUN \ # dev deps autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua \ # # php extensions && docker-php-source extract \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index cf7bf1a..36c5593 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr redis \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ @@ -21,10 +21,10 @@ RUN \ # dev deps autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev lua \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua \ # # php extensions && docker-php-source extract \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index c3e93e8..3113657 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -21,10 +21,10 @@ RUN \ # dev deps autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev libxslt-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ + libmemcached libssh2 libevent libev librdkafka libxslt lua openldap openldap-back-mdb tidyhtml yaml \ # # php extensions && docker-php-source extract \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 3e9bb64..cc4f7fc 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -21,9 +21,9 @@ RUN \ # dev deps autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev lua-dev libxslt-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ # # php extensions From 7c97a08d2497aadd0a1a4d8bb63f5250398d59f9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 12:02:18 +0700 Subject: [PATCH 103/311] feat: add grpc php extension --- 7.4-alp3.13.Dockerfile | 2 +- 7.4.Dockerfile | 2 +- 8.0-alp3.13.Dockerfile | 4 ++-- 8.0.Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index df1d56a..209fd54 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ + PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 36c5593..31f8510 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.4.12 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ + PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 3113657..5d34c5b 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -7,8 +7,8 @@ ENV \ SWOOLE_VERSION=4.5.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" diff --git a/8.0.Dockerfile b/8.0.Dockerfile index cc4f7fc..3401dfa 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -7,8 +7,8 @@ ENV \ SWOOLE_VERSION=4.5.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua rdkafka ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From d692f8e261dfe57f9a39ad9a772aa58e3c1d360a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 12:12:55 +0700 Subject: [PATCH 104/311] chore: add zlib for grpc --- 7.4-alp3.13.Dockerfile | 2 +- 7.4.Dockerfile | 2 +- 8.0-alp3.13.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 209fd54..88c7533 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -24,7 +24,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua zlib \ # # php extensions && docker-php-source extract \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 31f8510..bc5f61f 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -24,7 +24,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua zlib \ # # php extensions && docker-php-source extract \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 5d34c5b..530e4b4 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -24,7 +24,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ - libmemcached libssh2 libevent libev librdkafka libxslt lua openldap openldap-back-mdb tidyhtml yaml \ + libmemcached libssh2 libevent libev librdkafka libxslt lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 3401dfa..7839611 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -24,7 +24,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml \ + libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ From ec38839063096e76e0714ab9f436c743916b4e44 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 12:45:34 +0700 Subject: [PATCH 105/311] chore: add headers for grpc --- 7.4-alp3.13.Dockerfile | 4 ++-- 7.4.Dockerfile | 4 ++-- 8.0-alp3.13.Dockerfile | 4 ++-- 8.0.Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 88c7533..864758b 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -23,8 +23,8 @@ RUN \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps - && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua zlib \ + && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ # # php extensions && docker-php-source extract \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index bc5f61f..02098b5 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -23,8 +23,8 @@ RUN \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ # prod deps - && apk add --no-cache icu gettext gnu-libiconv imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka lua zlib \ + && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ # # php extensions && docker-php-source extract \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 530e4b4..23c93fb 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -23,8 +23,8 @@ RUN \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ - libmemcached libssh2 libevent libev librdkafka libxslt lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 7839611..cdbbfd1 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -23,8 +23,8 @@ RUN \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ From 2b62ef716210bdde4200b90ebe2b05ec9a3765a5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 9 May 2021 12:47:33 +0700 Subject: [PATCH 106/311] docs: add extensions list for php 7.4 and 8.0 --- README.md | 72 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 9bb2451..dd17194 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~100MB. It contains PHP8.0.6 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`]( -https://github.com/adhocore/docker-phpfpm/tree/7.4). +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile). If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -49,34 +48,67 @@ services: ### Extensions -The following PHP extensions are installed: +#### PHP8.0 + +The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -Total: 76 +Total: 78 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - exif - fileinfo - filter - ftp - gd -- gettext - gmp - hash - iconv -- igbinary - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phar -- posix - pspell - psr - readline -- redis - reflection - session - shmop -- simplexml - soap - sockets - sodium -- spl - sqlite3 - standard - swoole -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - uuid - xdebug - xhprof -- xml - xmlreader - xmlwriter - xsl -- yaml - zend opcache - zip - zlib +- gettext - gmp - grpc - hash +- iconv - igbinary - imap - intl +- json - ldap - libxml - lzf +- mbstring - memcached - mongodb - msgpack +- mysqli - mysqlnd - oauth - openssl +- pcntl - pcov - pcre - pdo +- pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql +- phar - posix - pspell - psr +- rdkafka - readline - redis - reflection +- session - shmop - simplexml - soap +- sockets - sodium - spl - sqlite3 +- standard - swoole - sysvmsg - sysvsem +- sysvshm - tidy - tokenizer - uuid +- xdebug - xhprof - xml - xmlreader +- xmlwriter - xsl - yaml - zend opcache +- zip - zlib +``` + +#### PHP7.4 + +The following PHP extensions are installed in `adhocore/phpfpm:7.4`: + +``` +Total: 86 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- event - exif - fileinfo - filter +- ftp - gd - gettext - gmp +- grpc - hash - hrtime - iconv +- igbinary - imagick - imap - intl +- json - ldap - libxml - lua +- lzf - mbstring - memcached - mongodb +- msgpack - mysqli - mysqlnd - oauth +- openssl - pcntl - pcov - pcre +- pdo - pdo_mysql - pdo_pgsql - pdo_sqlite +- pgsql - phalcon - phar - posix +- psr - rdkafka - readline - redis +- reflection - session - simplexml - soap +- sockets - sodium - spl - sqlite3 +- ssh2 - standard - swoole - swoole_async +- sysvmsg - sysvsem - sysvshm - tideways_xhprof +- tidy - tokenizer - uuid - xdebug +- xlswriter - xml - xmlreader - xmlwriter +- yaf - yaml - zend opcache - zephir parser +- zip - zlib ``` Read more about [pcov](https://github.com/krakjoe/pcov), -[psr](https://github.com/jbboehr/php-psr) +[psr](https://github.com/jbboehr/php-psr) ### Production Usage From 2ff5d7451a81433d706f9491e3fc05953fbf8646 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 10 May 2021 08:54:59 +0700 Subject: [PATCH 107/311] feat: add composer1 for 7.4 --- 7.4-alp3.13.Dockerfile | 3 ++- 7.4.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 864758b..1a96ec9 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -64,7 +64,8 @@ RUN \ && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ # # composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ # && composer global require hirak/prestissimo \ # # cleanup diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 02098b5..e430460 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -64,7 +64,8 @@ RUN \ && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ # # composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ # && composer global require hirak/prestissimo \ # # cleanup From 7eb8c144950b002547501d5c6887a550ed531945 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Mon, 10 May 2021 09:25:49 +0700 Subject: [PATCH 108/311] feat: bump swoole ext --- 7.4-alp3.13.Dockerfile | 8 ++++---- 7.4.Dockerfile | 7 ++++--- 8.0-alp3.13.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 1a96ec9..cfcfd44 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -6,8 +6,8 @@ ENV \ XHPROF_VERSION=5.0.1\ ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.4.12 \ - MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.6.6 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ @@ -35,9 +35,9 @@ RUN \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index e430460..14d6415 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -6,7 +6,8 @@ ENV \ XHPROF_VERSION=5.0.1\ ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.4.12 \ + SWOOLE_VERSION=4.6.6 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ @@ -35,9 +36,9 @@ RUN \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_VERSION.tar.gz \ + && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_VERSION swoole_async \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 23c93fb..cef1047 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari ENV \ MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.5.9 \ + SWOOLE_VERSION=4.6.6 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index cdbbfd1..b640519 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari ENV \ MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.5.9 \ + SWOOLE_VERSION=4.6.6 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ From a3ca94c86edd0bae2a4c49ac15f01464a52f84b0 Mon Sep 17 00:00:00 2001 From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com> Date: Sat, 29 May 2021 16:42:20 +0200 Subject: [PATCH 109/311] Added Freetype and JPEG support to GD PHP8 --- 8.0.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index b640519..50e5362 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -22,12 +22,14 @@ RUN \ autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ && pecl install $PECL_EXTENSIONS > /dev/null \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ From 1c786c356c46a92ad3b87b932972f7616865106d Mon Sep 17 00:00:00 2001 From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com> Date: Sat, 29 May 2021 16:45:09 +0200 Subject: [PATCH 110/311] Added Freetype and JPEG Support to PHP8-alp3.13 --- 8.0-alp3.13.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index cef1047..705c7c4 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -22,12 +22,14 @@ RUN \ autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ && pecl install $PECL_EXTENSIONS > /dev/null \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ From 4be3e87fec3fcb72b43b5ac8236de39cb89b329f Mon Sep 17 00:00:00 2001 From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com> Date: Sat, 29 May 2021 16:49:57 +0200 Subject: [PATCH 111/311] Added Freetype and JPEG Support to PHP7.4 --- 7.4.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 14d6415..7a2eaa4 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -23,6 +23,7 @@ RUN \ autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ @@ -45,6 +46,7 @@ RUN \ && tar xzf zephir_parser.tar.gz \ && rm -f zephir_parser.tar.gz \ && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ From bdcfb2f63ec683a77f48bdab7ef11f1ce3b22f7e Mon Sep 17 00:00:00 2001 From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com> Date: Sat, 29 May 2021 16:52:37 +0200 Subject: [PATCH 112/311] Added Freetype and JPEG Support to PHP7.4-alp3.13 --- 7.4-alp3.13.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index cfcfd44..e256686 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -22,6 +22,7 @@ RUN \ autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ @@ -44,6 +45,7 @@ RUN \ && tar xzf zephir_parser.tar.gz \ && rm -f zephir_parser.tar.gz \ && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ From 6f63b8136cad12cc0527784c33d822c711660f96 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 30 May 2021 11:50:42 +0700 Subject: [PATCH 113/311] fix(*): bump swoole version, disable async --- 7.4-alp3.13.Dockerfile | 8 ++++---- 7.4.Dockerfile | 8 ++++---- 8.0-alp3.13.Dockerfile | 9 +++++---- 8.0.Dockerfile | 9 +++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index e256686..f024a02 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -6,7 +6,7 @@ ENV \ XHPROF_VERSION=5.0.1\ ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.6.6 \ + SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ @@ -30,7 +30,7 @@ RUN \ # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && pecl install $PECL_EXTENSIONS \ + && pecl install $PECL_EXTENSIONS > /dev/null \ && cd /usr/src/php/ext/ \ && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ @@ -38,7 +38,7 @@ RUN \ && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ @@ -46,7 +46,7 @@ RUN \ && rm -f zephir_parser.tar.gz \ && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE > /dev/null \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ && pecl clear-cache \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 7a2eaa4..915c058 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -6,7 +6,7 @@ ENV \ XHPROF_VERSION=5.0.1\ ZEPHIR_VERSION=1.3.3 \ PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.6.6 \ + SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ @@ -31,7 +31,7 @@ RUN \ # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && pecl install $PECL_EXTENSIONS \ + && pecl install $PECL_EXTENSIONS > /dev/null \ && cd /usr/src/php/ext/ \ && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ @@ -39,7 +39,7 @@ RUN \ && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ @@ -47,7 +47,7 @@ RUN \ && rm -f zephir_parser.tar.gz \ && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \ + && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE > /dev/null \ && cd /usr/local/etc/php/conf.d/ \ && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ && pecl clear-cache \ diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 705c7c4..85c87fa 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari ENV \ MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.6.6 \ + SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ @@ -29,6 +29,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && pecl channel-update pecl.php.net \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ && pecl install $PECL_EXTENSIONS > /dev/null \ @@ -36,9 +37,9 @@ RUN \ && cd /usr/src/php/ext/ \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ && docker-php-ext-install -j "$(nproc)" swoole \ && docker-php-source delete \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 50e5362..0afbd27 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari ENV \ MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.6.6 \ + SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ @@ -29,6 +29,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && pecl channel-update pecl.php.net \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ && pecl install $PECL_EXTENSIONS > /dev/null \ @@ -36,9 +37,9 @@ RUN \ && cd /usr/src/php/ext/ \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ && docker-php-ext-install -j "$(nproc)" swoole \ && docker-php-source delete \ From 4d40e1513ad9e1c2280af79a75821c7db28f900b Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 30 May 2021 12:27:33 +0700 Subject: [PATCH 114/311] fix[7.4]: disable swoole async --- 7.4-alp3.13.Dockerfile | 4 ++-- 7.4.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index f024a02..84ff020 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -13,7 +13,7 @@ ENV \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" + soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" RUN \ # deps @@ -38,7 +38,7 @@ RUN \ && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 915c058..f470271 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -14,7 +14,7 @@ ENV \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole swoole_async sysvshm sysvmsg sysvsem tidy zip zephir_parser" + soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" RUN \ # deps @@ -39,7 +39,7 @@ RUN \ && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \ + && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ # zephir_parser && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ From c7286f7620e0f63a1df7d50b26e939655a5daa6d Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Jun 2021 07:30:16 +0700 Subject: [PATCH 115/311] feat: bump to php7.4.20 --- 7.4-alp3.13.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 84ff020..27abde5 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.19-fpm-alpine3.13 +FROM php:7.4.20-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 19fb44d71fe0f2b0befb8356a9fc8405eee17020 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Jun 2021 07:30:48 +0700 Subject: [PATCH 116/311] feat: bump to php7.4.20 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index f470271..8822495 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.19-fpm-alpine3.12 +FROM php:7.4.20-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 56bf058db519c6a56126851406bc2bf39f4f0a33 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Jun 2021 07:31:35 +0700 Subject: [PATCH 117/311] feat: bump to php8.0.7 --- 8.0-alp3.13.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 85c87fa..d529dcd 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.6-fpm-alpine3.13 +FROM php:8.0.7-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From a5bf669739f924649525d4e6f6ade7688e4a2010 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Jun 2021 07:32:03 +0700 Subject: [PATCH 118/311] feat: bump to php8.0.7 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 0afbd27..4a44f5a 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.6-fpm-alpine3.12 +FROM php:8.0.7-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 439d7b64e641c4dbd3d133ab814d7842a8779b96 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Jun 2021 07:41:43 +0700 Subject: [PATCH 119/311] docs: bump version, update usage --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd17194..c21db42 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Production+ready+PHP7+and+PHP8+docker+images+with+plenty+extensions&url=https://github.com/adhocore/docker-phpfpm&hashtags=docker,dockerimage,php7,php8,phpext) -Docker PHP FPM with lean alpine base. The download size is just about ~100MB. +Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.0.6 with plenty of common and useful extensions. +It contains PHP8.0.7 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile). +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.20. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -25,6 +25,13 @@ docker pull adhocore/phpfpm:8.0 # or for alpine 3.13 docker pull adhocore/phpfpm:8.0-alp3.13 + +# or for php 7.4 +docker pull adhocore/phpfpm:7.4 + +# or for php 7.4 on alpine 3.13 +docker pull adhocore/phpfpm:7.4-alp3.13 + ``` To use in docker-compose From 8ad86b2ec856279798189cc7761d9418225ecc7f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Jul 2021 09:16:18 +0700 Subject: [PATCH 120/311] feat: bump php7 to 7.4.21 --- 7.4-alp3.13.Dockerfile | 2 +- 7.4.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 27abde5..2ac50dd 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.20-fpm-alpine3.13 +FROM php:7.4.21-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 8822495..48bd7df 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.20-fpm-alpine3.12 +FROM php:7.4.21-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From ac006d6990bdaeec6946e3d7a7a551b9114f991c Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Jul 2021 09:16:39 +0700 Subject: [PATCH 121/311] feat: bump php8 to 8.0.7 --- 8.0-alp3.13.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index d529dcd..54812db 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.7-fpm-alpine3.13 +FROM php:8.0.8-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 4a44f5a..ba4bac3 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.7-fpm-alpine3.12 +FROM php:8.0.8-fpm-alpine3.12 MAINTAINER Jitendra Adhikari From 39a26489564fcf8c09e5d739447026c116845892 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Jul 2021 09:17:02 +0700 Subject: [PATCH 122/311] feat: add experimental php8.1 --- 8.1.Dockerfile | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 8.1.Dockerfile diff --git a/8.1.Dockerfile b/8.1.Dockerfile new file mode 100644 index 0000000..f45f82b --- /dev/null +++ b/8.1.Dockerfile @@ -0,0 +1,57 @@ +FROM php:8.1.0alpha2-fpm-alpine3.14 + +MAINTAINER Jitendra Adhikari + +ENV \ + MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.6.7 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" + +# docker-php-ext-* +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ + # prod deps + && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ +# +# php extensions + && docker-php-source extract \ + && pecl channel-update pecl.php.net \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ + && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ + && pecl install $PECL_EXTENSIONS > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && cd /usr/src/php/ext/ \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + && docker-php-ext-install -j "$(nproc)" swoole \ + && docker-php-source delete \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# ext +COPY ext.php /ext.php +RUN php -f /ext.php From a1673ce64ab943ccc33bccc5c7a0232ad9e326d8 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Jul 2021 09:20:59 +0700 Subject: [PATCH 123/311] feat: bump php8.1 to alpha3 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index f45f82b..58243ce 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0alpha2-fpm-alpine3.14 +FROM php:8.1.0alpha3-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From 1caad9dcb982f32db0645f60762f646e7fce4b05 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 9 Jul 2021 09:30:59 +0700 Subject: [PATCH 124/311] fix: new versions require alpine 3.13 --- 7.4.Dockerfile | 3 +-- 8.0.Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 48bd7df..1ee7ca9 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.21-fpm-alpine3.12 +FROM php:7.4.21-fpm-alpine3.13 MAINTAINER Jitendra Adhikari @@ -8,7 +8,6 @@ ENV \ PHALCON_VERSION=4.0.0 \ SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ - MAXMIND_VERSION=1.4.2 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index ba4bac3..54812db 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.8-fpm-alpine3.12 +FROM php:8.0.8-fpm-alpine3.13 MAINTAINER Jitendra Adhikari @@ -24,8 +24,8 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ From b1e0edbced8d7baa4ca1fc1f075231b0fea97813 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 30 Jul 2021 08:16:21 +0700 Subject: [PATCH 125/311] docs: badge label [skip ci] --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c21db42..fa94329 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ ## docker-phpfpm ![Docker Build](https://img.shields.io/docker/cloud/build/adhocore/phpfpm?style=flat-square) -[![Donate](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square)](https://www.paypal.me/ji10/50usd) +[![Donate 15](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+15)](https://www.paypal.me/ji10/15usd) +[![Donate 25](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+25)](https://www.paypal.me/ji10/25usd) +[![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Production+ready+PHP7+and+PHP8+docker+images+with+plenty+extensions&url=https://github.com/adhocore/docker-phpfpm&hashtags=docker,dockerimage,php7,php8,phpext) From fb5edb9b72ced5c4c5658ebba0f061d849f4cec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 22:07:50 +0000 Subject: [PATCH 126/311] build(deps): bump php from 7.4.21-fpm-alpine3.13 to 8.0.9-fpm-alpine3.13 Bumps php from 7.4.21-fpm-alpine3.13 to 8.0.9-fpm-alpine3.13. --- updated-dependencies: - dependency-name: php dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- 7.4-alp3.13.Dockerfile | 2 +- 7.4.Dockerfile | 2 +- 8.0-alp3.13.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 2ac50dd..174bfe8 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.21-fpm-alpine3.13 +FROM php:8.0.9-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 1ee7ca9..4324d71 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.21-fpm-alpine3.13 +FROM php:8.0.9-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile index 54812db..61e00de 100644 --- a/8.0-alp3.13.Dockerfile +++ b/8.0-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.8-fpm-alpine3.13 +FROM php:8.0.9-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 54812db..61e00de 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.8-fpm-alpine3.13 +FROM php:8.0.9-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 58243ce..70a3688 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0alpha3-fpm-alpine3.14 +FROM php:8.1.0beta1-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From e709e2ac479c92f73d3f9bec51417f11e630a169 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 31 Jul 2021 05:33:02 +0700 Subject: [PATCH 127/311] feat: bump php 7.4 to 7.4.22 --- 7.4-alp3.13.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile index 174bfe8..556b23e 100644 --- a/7.4-alp3.13.Dockerfile +++ b/7.4-alp3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.9-fpm-alpine3.13 +FROM php:7.4.22-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 8d1b714b635fa0c457a83cd7df1344cf7a1277f6 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 31 Jul 2021 05:35:04 +0700 Subject: [PATCH 128/311] feat: bump php 7.4 to 7.4.22 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 4324d71..8c33062 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.9-fpm-alpine3.13 +FROM php:7.4.22-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 471dc1cebacf7fa25f23a0738c844d23461b9557 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 17 Oct 2021 09:54:09 +0700 Subject: [PATCH 129/311] chore: cleanup 3.13 as it is default and 3.12 not supported --- 7.4-alp3.13.Dockerfile | 82 ------------------------------------------ 8.0-alp3.13.Dockerfile | 57 ----------------------------- 2 files changed, 139 deletions(-) delete mode 100644 7.4-alp3.13.Dockerfile delete mode 100644 8.0-alp3.13.Dockerfile diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile deleted file mode 100644 index 556b23e..0000000 --- a/7.4-alp3.13.Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -FROM php:7.4.22-fpm-alpine3.13 - -MAINTAINER Jitendra Adhikari - -ENV \ - XHPROF_VERSION=5.0.1\ - ZEPHIR_VERSION=1.3.3 \ - PHALCON_VERSION=4.0.0 \ - SWOOLE_VERSION=4.6.7 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ - LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ - ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ - PECL_BUNDLE="memcached event" \ - PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" - -RUN \ -# deps - apk add -U --no-cache --virtual temp \ - # dev deps - autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \ - icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ - freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ - # prod deps - && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ - libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ -# -# php extensions - && docker-php-source extract \ - && pecl channel-update pecl.php.net \ - && pecl install $PECL_EXTENSIONS > /dev/null \ - && cd /usr/src/php/ext/ \ - && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ - # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ - # zephir_parser - && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ - && tar xzf zephir_parser.tar.gz \ - && rm -f zephir_parser.tar.gz \ - && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE > /dev/null \ - && cd /usr/local/etc/php/conf.d/ \ - && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ - && pecl clear-cache \ - && docker-php-source delete \ -# -# tideways_xhprof - && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ - && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ - && phpize && ./configure \ - && make -j "$(nproc)" && make install \ - && docker-php-ext-enable tideways_xhprof \ -# -# phalcon - && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ - && cd /tmp/ && tar xzf phalcon.tar.gz \ - && cd cphalcon-$PHALCON_VERSION/build && sh install \ - && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ -# -# composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ - && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ -# && composer global require hirak/prestissimo \ -# -# cleanup - && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# docker-php-ext-disable -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile deleted file mode 100644 index 61e00de..0000000 --- a/8.0-alp3.13.Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -FROM php:8.0.9-fpm-alpine3.13 - -MAINTAINER Jitendra Adhikari - -ENV \ - MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.6.7 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ - LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ - PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" - -# docker-php-ext-* -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable - -RUN \ -# deps - apk add -U --no-cache --virtual temp \ - # dev deps - autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ - icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ - libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ - freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ - # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ - libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ -# -# php extensions - && docker-php-source extract \ - && pecl channel-update pecl.php.net \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && pecl install $PECL_EXTENSIONS > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ - && cd /usr/src/php/ext/ \ - # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole \ - && docker-php-source delete \ -# -# composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ - && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ -# -# cleanup - && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php From 44515f2acb01f7e01af758185552d17913653ecd Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 17 Oct 2021 09:54:47 +0700 Subject: [PATCH 130/311] feat: bump php8.0 to 8.0.11 and php7.4 to 7.4.24 --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 8c33062..2f283c7 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.22-fpm-alpine3.13 +FROM php:7.4.24-fpm-alpine3.13 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 61e00de..178cfd7 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.9-fpm-alpine3.13 +FROM php:8.0.11-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From a482ce8711ba00e240681c6baaee3ee9b0e48897 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 17 Oct 2021 09:55:37 +0700 Subject: [PATCH 131/311] feat: bump php8.1 to 8.1.rc-4 --- 8.1.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 70a3688..5f52649 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0beta1-fpm-alpine3.14 +FROM php:8.1.0RC4-fpm-alpine3.14 MAINTAINER Jitendra Adhikari @@ -45,8 +45,8 @@ RUN \ && docker-php-source delete \ # # composer - && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ - && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \ # # cleanup && apk del temp \ From 6641fd4e42438ad642798e66d6f2f62fac32816f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 17 Oct 2021 09:56:19 +0700 Subject: [PATCH 132/311] chore(workflow): add build push action --- .github/workflows/build.yml | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..115ee01 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +name: build + +on: + push: + branches: + - 'main' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: "[7.4] Build and push" + id: docker_build_74 + uses: docker/build-push-action@v2 + with: + push: true + file: 7.4.Dockerfile + tags: adhocore/phpfpm:7.4-alp3.13,adhocore/phpfpm:7.4 + - name: "[8.0] Build and push" + id: docker_build_80 + uses: docker/build-push-action@v2 + with: + push: true + file: 8.0.Dockerfile + tags: adhocore/phpfpm:8.0-alp3.13,adhocore/phpfpm:8.0 + - name: "[8.1] Build and push" + id: docker_build_81 + uses: docker/build-push-action@v2 + with: + push: true + file: 8.1.Dockerfile + tags: adhocore/phpfpm:8.1-rc From 2c0607be2fa04ed942ab4b4ca190817dd2e2ad5a Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:14:43 +0700 Subject: [PATCH 133/311] feat: bump PHP7.4 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 2f283c7..6e2ff87 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.24-fpm-alpine3.13 +FROM php:7.4.25-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From ed7cf516a7e05abe657e159a925ffde0f472a474 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:15:10 +0700 Subject: [PATCH 134/311] feat: bump PHP8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 178cfd7..24d84f5 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.11-fpm-alpine3.13 +FROM php:8.0.12-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 97369eeb5830901e58f0c155ae4c6d160e318554 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:15:54 +0700 Subject: [PATCH 135/311] feat: bump PHP8.1rc --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 5f52649..07c5f2c 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0RC4-fpm-alpine3.14 +FROM php:8.1.0RC5-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From d7e8f1ebf3f35322b634b8daaf3edbeccc364012 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:14:21 +0700 Subject: [PATCH 136/311] feat: bump 8.1 rc to 8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 07c5f2c..05e38b3 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0RC5-fpm-alpine3.14 +FROM php:8.1.0-alpine3.14 MAINTAINER Jitendra Adhikari From 8dddad321bbed769c80efbcfa0bc280f86b363ef Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:15:28 +0700 Subject: [PATCH 137/311] feat: bump 8.0 to 8.0.13 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 24d84f5..7bbc3aa 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.12-fpm-alpine3.13 +FROM php:8.0.13-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From 56ea258f5b6f16f5dba6d96f9d058d6e64ad5917 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:16:10 +0700 Subject: [PATCH 138/311] feat: bump 7.4 to 7.4.26 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 6e2ff87..d9ba778 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.25-fpm-alpine3.13 +FROM php:7.4.26-fpm-alpine3.13 MAINTAINER Jitendra Adhikari From d4dc5d62614a554a07a0425317182ed3a9d5f4e3 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 9 Dec 2021 12:21:02 +0700 Subject: [PATCH 139/311] chore: update workflow --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 115ee01..e7b56f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,7 @@ name: build on: + workflow_dispatch: push: branches: - 'main' From 33d998f2adafe7bdd0e301df7083bc6c69f1edd6 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 18 Mar 2022 10:28:17 +0545 Subject: [PATCH 140/311] feat: bump 7.4 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index d9ba778..30a0698 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.26-fpm-alpine3.13 +FROM php:7.4.28-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From a9d7ebc46249b5b24146e58d056c395e211c7caf Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 18 Mar 2022 10:29:17 +0545 Subject: [PATCH 141/311] feat: bump 8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 7bbc3aa..2ec8f38 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.13-fpm-alpine3.13 +FROM php:8.0.17-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From a7afac2d19b03271dd0efccc08c6920f556b7319 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 18 Mar 2022 10:30:11 +0545 Subject: [PATCH 142/311] feat: bump 8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 05e38b3..aafaf72 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.0-alpine3.14 +FROM php:8.1.4-alpine3.14 MAINTAINER Jitendra Adhikari From b032d9a6dd97b5de5891539cc5c383846ec387bc Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 23 Mar 2022 12:43:49 +0545 Subject: [PATCH 143/311] docs: bump version [skip ci][ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa94329..ff649f9 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.0.7 with plenty of common and useful extensions. +It contains PHP8.0.17 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.20. +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.28. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 5aacdab3eb0a72bf64ee56c2a51bfc5d4f38f166 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 20 Apr 2022 08:44:13 +0700 Subject: [PATCH 144/311] feat: bump 7.4 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 30a0698..9802fac 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.28-fpm-alpine3.14 +FROM php:7.4.29-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From 413ac0cb0760eff5f6c9dce644151db04eb2b375 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 20 Apr 2022 08:45:21 +0700 Subject: [PATCH 145/311] feat: bump 8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 2ec8f38..41234cd 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.17-fpm-alpine3.14 +FROM php:8.0.18-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From aa69d2af8406fb2e50d04d0377f457168f9bcde5 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:02:28 +0700 Subject: [PATCH 146/311] feat: bump 8.1 --- 8.1.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index aafaf72..ec24261 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,14 +1,14 @@ -FROM php:8.1.4-alpine3.14 +FROM php:8.1.5-alpine3.14 MAINTAINER Jitendra Adhikari ENV \ MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.6.7 \ + SWOOLE_VERSION=4.8.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS_FUTURE="event hrtime imagick lua ssh2-1.2 xlswriter" \ + PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From 4f559d89993ef98bf4e7813b1e3291c06c10b16d Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:30:30 +0700 Subject: [PATCH 147/311] chore: pull before build [skip ci][ci skip] --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7b56f5..4ced73b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,8 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: "Pull" + run: docker pull adhocore/phpfpm:7.4 && docker pull adhocore/phpfpm:8.0 && docker pull adhocore/phpfpm:8.1 || true - name: "[7.4] Build and push" id: docker_build_74 uses: docker/build-push-action@v2 From e7bac3b985374215aaa82e471f39bdbb1675daec Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Apr 2022 12:07:45 +0700 Subject: [PATCH 148/311] fix: 8.1 image name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ced73b..404e8cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,4 +39,4 @@ jobs: with: push: true file: 8.1.Dockerfile - tags: adhocore/phpfpm:8.1-rc + tags: adhocore/phpfpm:8.1 From 4443860a223678a09493ae5585b20074cc311a5d Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 1 May 2022 19:16:31 +0545 Subject: [PATCH 149/311] docs: build badge [skip ci][ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff649f9..22238f2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## docker-phpfpm -![Docker Build](https://img.shields.io/docker/cloud/build/adhocore/phpfpm?style=flat-square) +[![Docker build](https://github.com/adhocore/docker-phpfpm/actions/workflows/build.yml/badge.svg)](https://github.com/adhocore/docker-phpfpm/actions/workflows/build.yml) [![Donate 15](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+15)](https://www.paypal.me/ji10/15usd) [![Donate 25](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+25)](https://www.paypal.me/ji10/25usd) [![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) From f469854b3679b10750774ca711c1255c384c2730 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Wed, 25 May 2022 15:31:37 +0700 Subject: [PATCH 150/311] feat(8.*): bump php 8.0 and 8.1 --- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 41234cd..2059a77 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.18-fpm-alpine3.14 +FROM php:8.0.19-fpm-alpine3.14 MAINTAINER Jitendra Adhikari diff --git a/8.1.Dockerfile b/8.1.Dockerfile index ec24261..5396686 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.5-alpine3.14 +FROM php:8.1.6-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From d5cefddf4169fbbe7906fdc1ab4f16be9e57a24d Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 12 Jun 2022 12:41:19 +0545 Subject: [PATCH 151/311] feat: bump php 7.4 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 9802fac..4d03aa1 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.29-fpm-alpine3.14 +FROM php:7.4.30-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From 7ff48904305cb5d7f2988fdd46638427a66c0c54 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 12 Jun 2022 12:41:47 +0545 Subject: [PATCH 152/311] feat: bump php 8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 2059a77..80eae7d 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.19-fpm-alpine3.14 +FROM php:8.0.20-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From a74ddbdf8ee41697aeac75156667958890716ab6 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 12 Jun 2022 12:42:15 +0545 Subject: [PATCH 153/311] feat: bump php 8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 5396686..e590e22 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.6-fpm-alpine3.14 +FROM php:8.1.7-fpm-alpine3.14 MAINTAINER Jitendra Adhikari From 7b4ae9254bbf74689aea938979852fdef7bd3c8d Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 12 Jun 2022 12:50:31 +0545 Subject: [PATCH 154/311] Fix image alpine base (#56) * fix: alpine version * fix: alpine version * fix: alpine version --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 4d03aa1..067efc1 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.30-fpm-alpine3.14 +FROM php:7.4.30-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 80eae7d..4290d64 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.20-fpm-alpine3.14 +FROM php:8.0.20-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.1.Dockerfile b/8.1.Dockerfile index e590e22..eec242c 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.7-fpm-alpine3.14 +FROM php:8.1.7-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 89c65366ada38576e55a28272ad234cc08902a99 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 12 Jun 2022 17:38:43 +0700 Subject: [PATCH 155/311] docs: bump version, update ext list [skip ci] --- README.md | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 22238f2..6471ee7 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.0.17 with plenty of common and useful extensions. +It contains PHP8.1.7 and PHP8.0.20 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.28. +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.30. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -57,6 +57,35 @@ services: ### Extensions +#### PHP8.1 + +The following PHP extensions are installed in `adhocore/phpfpm:8.1`: + +``` +Total: 80 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - ftp +- gd - gettext - gmp - grpc +- hash - iconv - igbinary - imap +- intl - json - ldap - libxml +- lzf - mbstring - memcached - mongodb +- msgpack - mysqli - mysqlnd - oauth +- openssl - pcntl - pcov - pcre +- pdo - pdo_mysql - pdo_pgsql - pdo_sqlite +- pgsql - phar - posix - pspell +- psr - rdkafka - readline - redis +- reflection - session - shmop - simplexml +- soap - sockets - sodium - spl +- sqlite3 - standard - swoole - sysvmsg +- sysvsem - sysvshm - tidy - tokenizer +- uuid - xdebug - xhprof - xml +- xmlreader - xmlwriter - xsl - yaf +- yaml - zend opcache - zip - zlib +``` + + #### PHP8.0 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: @@ -90,7 +119,7 @@ Total: 78 The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` -Total: 86 +Total: 85 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -107,12 +136,12 @@ Total: 86 - psr - rdkafka - readline - redis - reflection - session - simplexml - soap - sockets - sodium - spl - sqlite3 -- ssh2 - standard - swoole - swoole_async -- sysvmsg - sysvsem - sysvshm - tideways_xhprof -- tidy - tokenizer - uuid - xdebug -- xlswriter - xml - xmlreader - xmlwriter -- yaf - yaml - zend opcache - zephir parser -- zip - zlib +- ssh2 - standard - swoole - sysvmsg +- sysvsem - sysvshm - tideways_xhprof - tidy +- tokenizer - uuid - xdebug - xlswriter +- xml - xmlreader - xmlwriter - yaf +- yaml - zend opcache - zephir parser - zip +- zlib ``` Read more about From 08b6a9fc47a9da83a7aa80b57244f4d0f4f686f2 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 8 Jul 2022 18:55:10 +0700 Subject: [PATCH 156/311] feat: bump php8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 4290d64..ac11724 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.20-fpm-alpine3.15 +FROM php:8.0.21-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From b059bc76b4b79a4552c3024ec0f83b8fa6a832cf Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 8 Jul 2022 18:55:49 +0700 Subject: [PATCH 157/311] feat: bump php8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index eec242c..30ba12a 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.7-fpm-alpine3.15 +FROM php:8.1.8-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 3bcecd11dbb6baf13fcb358c637ea45a37bc6deb Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 5 Aug 2022 19:33:58 +0545 Subject: [PATCH 158/311] feat: bump php 8.1 to 8.1.9 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 30ba12a..720ef94 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.8-fpm-alpine3.15 +FROM php:8.1.9-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From ccfd93a0e80775afaeba3cfac155053cadb84cc9 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 5 Aug 2022 19:34:49 +0545 Subject: [PATCH 159/311] feat: bump php 8.0 to 8.0.22 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index ac11724..c395fac 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.21-fpm-alpine3.15 +FROM php:8.0.22-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 8a5db417e501e4331a016376775862084e0a9a1e Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 6 Aug 2022 07:16:52 +0545 Subject: [PATCH 160/311] docs: bump version [skip ci][ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6471ee7..ac42c7a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.1.7 and PHP8.0.20 with plenty of common and useful extensions. +It contains PHP8.1.9 and PHP8.0.22 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.30. From 8c8db225bbeec014d1f8f1cf81955fa015aa15f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 23:15:03 +0000 Subject: [PATCH 161/311] build(deps): bump php Bumps php from 7.4.30-fpm-alpine3.15 to 8.1.10-fpm-alpine3.15. --- updated-dependencies: - dependency-name: php dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 067efc1..4f663fe 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.30-fpm-alpine3.15 +FROM php:8.1.10-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index c395fac..54d1ee1 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.22-fpm-alpine3.15 +FROM php:8.1.10-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 720ef94..64b6b31 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.9-fpm-alpine3.15 +FROM php:8.1.10-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 54eebb78d7ba3968aa8d2fa77397248c8cc6ea64 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 3 Sep 2022 06:17:52 +0700 Subject: [PATCH 162/311] revert: php 7.4 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 4f663fe..067efc1 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.10-fpm-alpine3.15 +FROM php:7.4.30-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 5307f8c80bd687b2db49f1af259fa8627a06491c Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 3 Sep 2022 06:18:58 +0700 Subject: [PATCH 163/311] feat: bump php8.0 to 8.0.23 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 54d1ee1..51ca636 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.10-fpm-alpine3.15 +FROM php:8.0.23-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 02124528726ef4a2dbf0d2e47d60db8bca55cbbf Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 3 Sep 2022 10:06:36 +0700 Subject: [PATCH 164/311] docs: bump version [skip ci][ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac42c7a..1e7bc5e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.1.9 and PHP8.0.22 with plenty of common and useful extensions. +It contains PHP8.1.10 and PHP8.0.23 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.30. From 35b80d664da12806636aa3ec463286f220e5016e Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 26 Sep 2022 22:37:36 +0700 Subject: [PATCH 165/311] chore: ~ [skip ci][ci skip] --- .github/FUNDING.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 5ea509b..26f1f3e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ -custom: ["https://paypal.me/ji10"] +github: adhocore +custom: ['https://paypal.me/ji10'] From 18998db365da8f071374c2f0fe6efc892e131232 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 30 Sep 2022 08:51:21 +0700 Subject: [PATCH 166/311] feat: bump to v7.4.32 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 067efc1..388b85c 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.30-fpm-alpine3.15 +FROM php:7.4.32-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 1a1e10ae2897f0f97ea21f2983f5432ba4486aa2 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 30 Sep 2022 08:51:58 +0700 Subject: [PATCH 167/311] feat: bump to v8.1.11 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 64b6b31..a903fcc 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.10-fpm-alpine3.15 +FROM php:8.1.11-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 8383621f801f814520e043a2fdc62c93c0691c2e Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 30 Sep 2022 21:46:31 +0700 Subject: [PATCH 168/311] docs: bump version [skip ci][ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e7bc5e..6567f35 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.1.10 and PHP8.0.23 with plenty of common and useful extensions. +It contains PHP8.1.11 and PHP8.0.24 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.30. From 853b83cc047707884af3b527fa99b0cd10dd1c4b Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 1 Oct 2022 20:53:23 +0700 Subject: [PATCH 169/311] feat: bump pho8.0 to v8.0.24 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 51ca636..cf2e1b5 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.23-fpm-alpine3.15 +FROM php:8.0.24-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From a1a01db563a147d674447a1f9780bb542d03020f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Oct 2022 16:15:36 +0700 Subject: [PATCH 170/311] feat: add simdjson a faster json decoder as a pecl ext --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 388b85c..a16c426 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -10,7 +10,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ - ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ + simdjson ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" diff --git a/8.0.Dockerfile b/8.0.Dockerfile index cf2e1b5..5fca635 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" diff --git a/8.1.Dockerfile b/8.1.Dockerfile index a903fcc..04a30f6 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="event hrtime imagick lua ssh2-1.2 xlswriter" \ - PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka uuid xdebug xhprof yaf yaml" \ + PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From 4c6d7510305d0bab8b7d37cb9aa7415b1805cb62 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Oct 2022 16:16:58 +0700 Subject: [PATCH 171/311] ext.php --- ext.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ext.php b/ext.php index c0f4c1e..49cb919 100644 --- a/ext.php +++ b/ext.php @@ -1,6 +1,7 @@ Date: Sun, 16 Oct 2022 17:00:49 +0700 Subject: [PATCH 172/311] feat: add more pecl extensions --- 8.0.Dockerfile | 6 +++--- 8.1.Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 5fca635..fbe386d 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -7,7 +7,7 @@ ENV \ SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \ + PECL_EXTENSIONS_FUTURE="ev imagick ssh2-1.3.1 xlswriter yaf" \ PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -32,8 +32,8 @@ RUN \ && pecl channel-update pecl.php.net \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && pecl install $PECL_EXTENSIONS > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ && cd /usr/src/php/ext/ \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 04a30f6..1c44b0c 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -7,7 +7,7 @@ ENV \ SWOOLE_VERSION=4.8.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="event hrtime imagick lua ssh2-1.2 xlswriter" \ + PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -32,8 +32,8 @@ RUN \ && pecl channel-update pecl.php.net \ && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && pecl install $PECL_EXTENSIONS > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ && cd /usr/src/php/ext/ \ # swoole && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ From 305b40de786ab764239b89dc13f75d22b6bee176 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Oct 2022 17:06:32 +0700 Subject: [PATCH 173/311] build(workflow): build latest 8.1+ first --- .github/workflows/build.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 404e8cf..32d8fdb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,13 +19,15 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: "Pull" run: docker pull adhocore/phpfpm:7.4 && docker pull adhocore/phpfpm:8.0 && docker pull adhocore/phpfpm:8.1 || true - - name: "[7.4] Build and push" - id: docker_build_74 + + - name: "[8.1] Build and push" + id: docker_build_81 uses: docker/build-push-action@v2 with: push: true - file: 7.4.Dockerfile - tags: adhocore/phpfpm:7.4-alp3.13,adhocore/phpfpm:7.4 + file: 8.1.Dockerfile + tags: adhocore/phpfpm:8.1 + - name: "[8.0] Build and push" id: docker_build_80 uses: docker/build-push-action@v2 @@ -33,10 +35,11 @@ jobs: push: true file: 8.0.Dockerfile tags: adhocore/phpfpm:8.0-alp3.13,adhocore/phpfpm:8.0 - - name: "[8.1] Build and push" - id: docker_build_81 + + - name: "[7.4] Build and push" + id: docker_build_74 uses: docker/build-push-action@v2 with: push: true - file: 8.1.Dockerfile - tags: adhocore/phpfpm:8.1 + file: 7.4.Dockerfile + tags: adhocore/phpfpm:7.4-alp3.13,adhocore/phpfpm:7.4 From 8f6f892380687fd9ec591b9b85e2225d64161443 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Oct 2022 17:11:04 +0700 Subject: [PATCH 174/311] feat: add 8.2 dockerfile --- 8.2.Dockerfile | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 8.2.Dockerfile diff --git a/8.2.Dockerfile b/8.2.Dockerfile new file mode 100644 index 0000000..a92f041 --- /dev/null +++ b/8.2.Dockerfile @@ -0,0 +1,57 @@ +FROM php:8.2.0RC4-fpm-alpine3.15 + +MAINTAINER Jitendra Adhikari + +ENV \ + MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.8.9 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ + PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ + pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" + +# docker-php-ext-* +COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ + # prod deps + && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ +# +# php extensions + && docker-php-source extract \ + && pecl channel-update pecl.php.net \ + && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ + && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ + && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ + && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ + && cd /usr/src/php/ext/ \ + # swoole + && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + && rm -f swoole.tar.gz swoole_async.tar.gz \ + && docker-php-ext-install -j "$(nproc)" swoole \ + && docker-php-source delete \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* + +# ext +COPY ext.php /ext.php +RUN php -f /ext.php From 95e72f3d3985f929c0fedfe2bce71f4427fcc2d5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Sun, 16 Oct 2022 17:11:40 +0700 Subject: [PATCH 175/311] build(workflow): build 8.2 also --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32d8fdb..ecbe7e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,3 +43,11 @@ jobs: push: true file: 7.4.Dockerfile tags: adhocore/phpfpm:7.4-alp3.13,adhocore/phpfpm:7.4 + + - name: "[8.2] Build and push" + id: docker_build_82 + uses: docker/build-push-action@v2 + with: + push: true + file: 8.2.Dockerfile + tags: adhocore/phpfpm:8.2 From 16a45df6ebf018f9267321323078a18ac4060558 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:14:57 +0700 Subject: [PATCH 176/311] docs: on composer [skip ci][ci skip] --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6567f35..14d1e3b 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,10 @@ services: # ... ``` +### Composer + +Latest versions of both Composer v1 and v2 are installed already. You can run v2 with `composer` and v1 with `composer1`. + ### Extensions #### PHP8.1 From 96020eab54ec0036d57c61962d91450ef4563ec1 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:30:36 +0700 Subject: [PATCH 177/311] refactor: rename bin files (remove .sh ext) --- docker-pickle-ext-install.sh => docker-pecl-ext-install | 0 docker-php-ext-disable.sh => docker-php-ext-disable | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docker-pickle-ext-install.sh => docker-pecl-ext-install (100%) rename docker-php-ext-disable.sh => docker-php-ext-disable (100%) diff --git a/docker-pickle-ext-install.sh b/docker-pecl-ext-install similarity index 100% rename from docker-pickle-ext-install.sh rename to docker-pecl-ext-install diff --git a/docker-php-ext-disable.sh b/docker-php-ext-disable similarity index 100% rename from docker-php-ext-disable.sh rename to docker-php-ext-disable From e4fc4e3e42898e92ce1f672e7bdac3cf9fabe2b8 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:32:05 +0700 Subject: [PATCH 178/311] refactor: install ext only if required --- docker-pecl-ext-install | 22 +++++++++++----------- docker-php-ext-disable | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index c6a1dab..803d256 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -2,6 +2,8 @@ set -e +extDir=$(php -r 'echo ini_get("extension_dir");') + usage() { echo "usage: $0 [options] module-name [module-name ...]" echo " ie: $0 apcu" @@ -11,22 +13,20 @@ usage() { exit 1 } - modules= for module; do [[ "$module" == "--help" ]] || [[ "$module" == "-h" ]] && usage >&2 [[ -n "$modules" ]] && modules="$modules $module" || modules="$module" done +[[ "" = "$modules" ]] && exit 0 -[[ -n "$module" ]] || usage >&2 - -if ! command -v pickle &> /dev/null; then - echo "Installing pickle" - curl -sSLo /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar - chmod +x /usr/local/bin/pickle -fi - +xmodules= for module in $modules; do - (php -m | grep -q $module && echo "$module already installed") \ - || (pickle install -n --defaults $module && docker-php-ext-enable $module > /dev/null) + docker-php-ext-enable $module > /dev/null || true + (php -m | grep -q $module || ls $extDir/$module.so && echo "$module already installed") \ + || ([[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module") done +[[ "" = "$xmodules" ]] && exit 0 + +echo "pecl install $xmodules" +pecl install $xmodules > /dev/null diff --git a/docker-php-ext-disable b/docker-php-ext-disable index 0faf39c..ad2a56e 100755 --- a/docker-php-ext-disable +++ b/docker-php-ext-disable @@ -1,4 +1,5 @@ #!/bin/sh + set -e extDir=$(php -r 'echo ini_get("extension_dir");') From a6a7d6fb7d0ad50d3bcb8ecf68db2fbc38759662 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:32:23 +0700 Subject: [PATCH 179/311] feat: install ext if only required --- docker-php-ext-install-if | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 docker-php-ext-install-if diff --git a/docker-php-ext-install-if b/docker-php-ext-install-if new file mode 100755 index 0000000..5cf6abe --- /dev/null +++ b/docker-php-ext-install-if @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +extDir=$(php -r 'echo ini_get("extension_dir");') + +modules= +for module; do + [[ "" != "$module" ]] && { + php -m | grep $module || modules="$modules $module" + } +done +[[ "" = "$modules" ]] && exit 0 + +xmodules= +for module in $modules; do + [[ "" != "$module" ]] && { + docker-php-ext-enable $module > /dev/null || true + (php -m | grep $module || ls $extDir/$module.so && echo "$module already installed") \ + || ([[ "" != "$modules" ]] && modules="$modules $module" || modules="$module") + } +done +[[ "" = "$xmodules" ]] && exit 0 + +echo "docker-php-ext-install $xmodules" +docker-php-ext-install $xmodules > /dev/null From 9839d71cff7fdd5065b2496126321b40c4c03c80 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:33:01 +0700 Subject: [PATCH 180/311] feat: speed up 8.1 build --- 8.1.Dockerfile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 1c44b0c..4682ea2 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -12,8 +12,15 @@ ENV \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" -# docker-php-ext-* -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php RUN \ # deps @@ -24,25 +31,29 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc \ + icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ + openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ + && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole \ - && docker-php-source delete \ + && docker-php-ext-install -j "$(nproc)" swoole); } \ + && { pecl clear-cache || true; } \ + && docker-php-ext-disable xdebug \ + && docker-php-source delete \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ @@ -50,8 +61,5 @@ RUN \ # # cleanup && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From 0eada744ac57f4fd65f29022f00d4849ecba5c01 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:33:25 +0700 Subject: [PATCH 181/311] feat: speed up 8.0 build --- 8.0.Dockerfile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index fbe386d..72a0e8e 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -12,8 +12,15 @@ ENV \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" -# docker-php-ext-* -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +COPY --from=adhocore/phpfpm:8.0 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ +COPY --from=adhocore/phpfpm:8.0 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php RUN \ # deps @@ -24,25 +31,29 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ - libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc \ + icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + libmemcached libssh2 libevent libev librdkafka libxslt \ + linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ + && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole \ - && docker-php-source delete \ + && docker-php-ext-install -j "$(nproc)" swoole); } \ + && { pecl clear-cache || true; } \ + && docker-php-ext-disable xdebug \ + && docker-php-source delete \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ @@ -50,8 +61,5 @@ RUN \ # # cleanup && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From f5b9cf26e1dd1c227e9bb8ce513882c300850b80 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:34:38 +0700 Subject: [PATCH 182/311] feat: speed up 7.4 build --- 7.4.Dockerfile | 51 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index a16c426..154208a 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -15,6 +15,16 @@ ENV \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +COPY --from=adhocore/phpfpm:7.4 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ +COPY --from=adhocore/phpfpm:7.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php + RUN \ # deps apk add -U --no-cache --virtual temp \ @@ -30,40 +40,41 @@ RUN \ # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && pecl install $PECL_EXTENSIONS > /dev/null \ + && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS \ && cd /usr/src/php/ext/ \ && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ + && rm -f swoole.tar.gz swoole_async.tar.gz); } \ # zephir_parser - && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + && { php -m | grep swoole || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ && tar xzf zephir_parser.tar.gz \ && rm -f zephir_parser.tar.gz \ - && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE > /dev/null \ + && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser); } \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS $PECL_BUNDLE \ && cd /usr/local/etc/php/conf.d/ \ - && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \ - && pecl clear-cache \ - && docker-php-source delete \ + && { mv docker-php-ext-event.ini docker-php-ext-zevent.ini || true; } \ + && { pecl clear-cache || true; } \ + && docker-php-ext-disable xdebug \ + && docker-php-source delete \ # # tideways_xhprof - && curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ + && { php -m | grep tideways_xhprof || (curl -sSLo /tmp/xhprof.tar.gz https://github.com/tideways/php-xhprof-extension/archive/v$XHPROF_VERSION.tar.gz \ && cd /tmp/ && tar xzf xhprof.tar.gz && cd php-xhprof-extension-$XHPROF_VERSION \ && phpize && ./configure \ && make -j "$(nproc)" && make install \ - && docker-php-ext-enable tideways_xhprof \ + && docker-php-ext-enable tideways_xhprof); } \ # # phalcon - && curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ + && { php -m | grep phalcon || (curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ && cd /tmp/ && tar xzf phalcon.tar.gz \ && cd cphalcon-$PHALCON_VERSION/build && sh install \ - && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini \ + && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini); } \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ @@ -72,11 +83,5 @@ RUN \ # # cleanup && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# docker-php-ext-disable -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From 0eab59a7da1f4bcb6077d67cee78fe55b9e4a1b4 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:41:35 +0700 Subject: [PATCH 183/311] feat: prepare 8.2 for faster builds --- 8.2.Dockerfile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index a92f041..5700060 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -12,8 +12,15 @@ ENV \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" -# docker-php-ext-* -COPY docker-php-ext-disable.sh /usr/local/bin/docker-php-ext-disable +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php RUN \ # deps @@ -24,25 +31,29 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ - libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ + && apk add --no-cache aspell gettext gnu-libiconv grpc \ + icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ + openldap-back-mdb tidyhtml yaml zlib \ # # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \ - && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \ - && yes '' | pecl install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE > /dev/null \ - && docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ + && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole - && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole \ - && docker-php-source delete \ + && docker-php-ext-install -j "$(nproc)" swoole); } \ + && { pecl clear-cache || true; } \ + && docker-php-ext-disable xdebug \ + && docker-php-source delete \ # # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ @@ -50,8 +61,5 @@ RUN \ # # cleanup && apk del temp \ - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* - -# ext -COPY ext.php /ext.php -RUN php -f /ext.php + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From d6a3f8912e003cee3aabd0bf82dcbd8bc5aede01 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:42:00 +0700 Subject: [PATCH 184/311] docs: update extensions info --- README.md | 7 +++++++ ext.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 14d1e3b..2cff14a 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,11 @@ Latest versions of both Composer v1 and v2 are installed already. You can run v2 ### Extensions +`xdebug` is installed but disabled by default for performance reason, +just run `docker-php-ext-enable xdebug` to enable it again without having to rebuild/recompile. + +Below you can find list of extensions by image tags. + #### PHP8.1 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: @@ -165,3 +170,5 @@ RUN docker-php-ext-disable xdebug pcov ldap ``` > `docker-php-ext-disable` is shell script available in `adhocore/phpfpm:8.0` only and not in official PHP docker images. + +> Extensions disabled can be re enabled with `docker-php-ext-enable` later again without the overhead of recompiling/rebuilding all over again. diff --git a/ext.php b/ext.php index 49cb919..20ef346 100644 --- a/ext.php +++ b/ext.php @@ -1,7 +1,7 @@ Date: Tue, 18 Oct 2022 19:56:01 +0700 Subject: [PATCH 185/311] fix: extension may have version --- docker-pecl-ext-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index 803d256..73bf9ae 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -22,7 +22,7 @@ done xmodules= for module in $modules; do - docker-php-ext-enable $module > /dev/null || true + docker-php-ext-enable $(echo $module | sed -E 's/\-[^ ]+//g') > /dev/null || true (php -m | grep -q $module || ls $extDir/$module.so && echo "$module already installed") \ || ([[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module") done From fc0cf3a2465fd7e9cad93f1270f8b110caf3b8ef Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 19:56:52 +0700 Subject: [PATCH 186/311] fix: 8.2 does not support swoole yet? --- 8.2.Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 5700060..415f62e 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -45,12 +45,12 @@ RUN \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole - && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole); } \ + # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + # && rm -f swoole.tar.gz swoole_async.tar.gz \ + # && docker-php-ext-install -j "$(nproc)" swoole); } \ && { pecl clear-cache || true; } \ && docker-php-ext-disable xdebug \ && docker-php-source delete \ From 1a571a6af2cbdaa11d5259120c2b176354c60780 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Tue, 18 Oct 2022 20:13:27 +0700 Subject: [PATCH 187/311] fix: maybe that works for 8.2? --- 8.2.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 415f62e..cd7f433 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -51,8 +51,8 @@ RUN \ # # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ # && rm -f swoole.tar.gz swoole_async.tar.gz \ # && docker-php-ext-install -j "$(nproc)" swoole); } \ - && { pecl clear-cache || true; } \ - && docker-php-ext-disable xdebug \ + # && { pecl clear-cache || true; } \ + && { docker-php-ext-disable xdebug || true; } \ && docker-php-source delete \ # # composer From 657c057a6379d3f43aaca310775cedfe71d054be Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 20 Oct 2022 18:57:17 +0700 Subject: [PATCH 188/311] feat: add phalcon from pecl --- 7.4.Dockerfile | 8 +------- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 154208a..1526ddc 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \ + PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov phalcon psr rdkafka redis \ simdjson ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ @@ -70,12 +70,6 @@ RUN \ && make -j "$(nproc)" && make install \ && docker-php-ext-enable tideways_xhprof); } \ # -# phalcon - && { php -m | grep phalcon || (curl -sSLo /tmp/phalcon.tar.gz https://codeload.github.com/phalcon/cphalcon/tar.gz/v$PHALCON_VERSION \ - && cd /tmp/ && tar xzf phalcon.tar.gz \ - && cd cphalcon-$PHALCON_VERSION/build && sh install \ - && docker-php-ext-enable phalcon --ini-name docker-php-ext-phalcon.ini); } \ -# # composer && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \ && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 72a0e8e..08b62bb 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev imagick ssh2-1.3.1 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 4682ea2..b0a3ef1 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ - PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ + PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" From b7f74370bda01d8f41df059ed42cca61cb80dc3e Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 20 Oct 2022 18:57:52 +0700 Subject: [PATCH 189/311] fix: remove redundant check, redirect output --- docker-pecl-ext-install | 5 +++-- docker-php-ext-install-if | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index 73bf9ae..74d98c4 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -22,8 +22,9 @@ done xmodules= for module in $modules; do - docker-php-ext-enable $(echo $module | sed -E 's/\-[^ ]+//g') > /dev/null || true - (php -m | grep -q $module || ls $extDir/$module.so && echo "$module already installed") \ + mod=$(echo $module | sed -E 's/\-[^ ]+//g') + php -m | grep -q $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true + (ls $extDir/$mod.so >/dev/null && echo "$module already installed") \ || ([[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module") done [[ "" = "$xmodules" ]] && exit 0 diff --git a/docker-php-ext-install-if b/docker-php-ext-install-if index 5cf6abe..47e5b6d 100755 --- a/docker-php-ext-install-if +++ b/docker-php-ext-install-if @@ -14,11 +14,10 @@ done xmodules= for module in $modules; do - [[ "" != "$module" ]] && { - docker-php-ext-enable $module > /dev/null || true - (php -m | grep $module || ls $extDir/$module.so && echo "$module already installed") \ - || ([[ "" != "$modules" ]] && modules="$modules $module" || modules="$module") - } + mod=$(echo $module | sed -E 's/\-[^ ]+//g') + php -m | grep -q $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true + (ls $extDir/$mod.so >/dev/null && echo "$module already installed") \ + || ([[ "" != "$modules" ]] && modules="$modules $module" || modules="$module") done [[ "" = "$xmodules" ]] && exit 0 From a1bcfdc426ded8349be1fc81fcde585b6e134ed9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Thu, 20 Oct 2022 18:58:35 +0700 Subject: [PATCH 190/311] docs: update extensions list --- README.md | 124 +++++++++++++++++++++++++++--------------------------- ext.php | 2 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 2cff14a..4e4a6f0 100644 --- a/README.md +++ b/README.md @@ -20,20 +20,17 @@ It comes prepackaged with `composer` - both v1 and v2. Use `composer2` command for v2 and `composer` for v1. ## Usage + To pull latest image: ```sh -docker pull adhocore/phpfpm:8.0 +docker pull adhocore/phpfpm:8.1 -# or for alpine 3.13 -docker pull adhocore/phpfpm:8.0-alp3.13 +# or for php 8.0 +docker pull adhocore/phpfpm:8.0 # or for php 7.4 docker pull adhocore/phpfpm:7.4 - -# or for php 7.4 on alpine 3.13 -docker pull adhocore/phpfpm:7.4-alp3.13 - ``` To use in docker-compose @@ -71,56 +68,59 @@ Below you can find list of extensions by image tags. The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -Total: 80 +Total: 85 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev -- exif - fileinfo - filter - ftp -- gd - gettext - gmp - grpc -- hash - iconv - igbinary - imap -- intl - json - ldap - libxml -- lzf - mbstring - memcached - mongodb -- msgpack - mysqli - mysqlnd - oauth -- openssl - pcntl - pcov - pcre -- pdo - pdo_mysql - pdo_pgsql - pdo_sqlite -- pgsql - phar - posix - pspell -- psr - rdkafka - readline - redis -- reflection - session - shmop - simplexml -- soap - sockets - sodium - spl -- sqlite3 - standard - swoole - sysvmsg +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phar +- posix - pspell - psr - rdkafka +- readline - redis - reflection - session +- shmop - simdjson - simplexml - soap +- sockets - sodium - spl - sqlite3 +- ssh2 - standard - swoole - sysvmsg - sysvsem - sysvshm - tidy - tokenizer -- uuid - xdebug - xhprof - xml -- xmlreader - xmlwriter - xsl - yaf -- yaml - zend opcache - zip - zlib +- uuid - xdebug - xhprof - xlswriter +- xml - xmlreader - xmlwriter - xsl +- yaf - yaml - zend opcache - zip +- zlib ``` - #### PHP8.0 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -Total: 78 +Total: 85 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl -- date - dom - ds - exif -- fileinfo - filter - ftp - gd -- gettext - gmp - grpc - hash -- iconv - igbinary - imap - intl -- json - ldap - libxml - lzf -- mbstring - memcached - mongodb - msgpack -- mysqli - mysqlnd - oauth - openssl -- pcntl - pcov - pcre - pdo -- pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql -- phar - posix - pspell - psr -- rdkafka - readline - redis - reflection -- session - shmop - simplexml - soap +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phar +- posix - pspell - psr - rdkafka +- readline - redis - reflection - session +- shmop - simdjson - simplexml - soap - sockets - sodium - spl - sqlite3 -- standard - swoole - sysvmsg - sysvsem -- sysvshm - tidy - tokenizer - uuid -- xdebug - xhprof - xml - xmlreader -- xmlwriter - xsl - yaml - zend opcache -- zip - zlib +- ssh2 - standard - swoole - sysvmsg +- sysvsem - sysvshm - tidy - tokenizer +- uuid - xdebug - xhprof - xlswriter +- xml - xmlreader - xmlwriter - xsl +- yaf - yaml - zend opcache - zip +- zlib ``` #### PHP7.4 @@ -128,29 +128,29 @@ Total: 78 The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` -Total: 85 +Total: 87 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev - event - exif - fileinfo - filter -- ftp - gd - gettext - gmp -- grpc - hash - hrtime - iconv -- igbinary - imagick - imap - intl -- json - ldap - libxml - lua -- lzf - mbstring - memcached - mongodb -- msgpack - mysqli - mysqlnd - oauth -- openssl - pcntl - pcov - pcre -- pdo - pdo_mysql - pdo_pgsql - pdo_sqlite -- pgsql - phalcon - phar - posix -- psr - rdkafka - readline - redis -- reflection - session - simplexml - soap -- sockets - sodium - spl - sqlite3 -- ssh2 - standard - swoole - sysvmsg -- sysvsem - sysvshm - tideways_xhprof - tidy -- tokenizer - uuid - xdebug - xlswriter -- xml - xmlreader - xmlwriter - yaf -- yaml - zend opcache - zephir parser - zip -- zlib +- fpm - ftp - gd - gettext +- gmp - grpc - hash - hrtime +- iconv - igbinary - imagick - imap +- intl - json - ldap - libxml +- lua - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phalcon - phar +- posix - psr - rdkafka - readline +- redis - reflection - session - simdjson +- simplexml - soap - sockets - sodium +- spl - sqlite3 - ssh2 - standard +- swoole - sysvmsg - sysvsem - sysvshm +- tideways_xhprof - tidy - tokenizer - uuid +- xdebug - xlswriter - xml - xmlreader +- xmlwriter - yaf - yaml - zend opcache +- zephir parser - zip - zlib ``` Read more about diff --git a/ext.php b/ext.php index 20ef346..0eb1be4 100644 --- a/ext.php +++ b/ext.php @@ -3,7 +3,7 @@ $ex = array_map('strtolower', get_loaded_extensions()); $ex = array_merge($ex, ['fpm', 'xdebug']); -echo 'Total: ', count($ex), "\n"; +echo sprintf('PHP %s, Total extensions: %d', PHP_VERSION, count($ex)), "\n"; sort($ex); foreach (array_chunk($ex, 4) as $ee) { From da7e293a106250fa305e87a60d0c5da3a7c915c9 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 20 Oct 2022 19:07:46 +0700 Subject: [PATCH 191/311] docs: 8.2rc [skip ci][ci skip] --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 4e4a6f0..07e82b4 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,14 @@ docker pull adhocore/phpfpm:8.0 docker pull adhocore/phpfpm:7.4 ``` +#### 8.2RC + +8.2 is release candidate and not yet production ready, but of course you can test/develop on it locally. + +```sh +docker pull adhocore/phpfpm:8.2 +``` + To use in docker-compose ```yaml # ./docker-compose.yml From b139b80f9c11360d8203e3f9bef35836144ef3e9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 21 Oct 2022 17:49:21 +0700 Subject: [PATCH 192/311] feat: adjust php8.2 extensions --- 8.2.Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index cd7f433..0da52bc 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -7,17 +7,19 @@ ENV \ SWOOLE_VERSION=4.8.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ - PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ - PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" + PECL_EXTENSIONS="apcu ast ds ev igbinary imagick lzf memcached mongodb msgpack oauth pcov \ + psr redis rdkafka simdjson ssh2-1.3.1 uuid xhprof xlswriter yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql \ + pdo_pgsql pspell shmop soap sysvshm sysvmsg sysvsem tidy xsl zip" \ + PECL_EXTENSIONS_FUTURE="grpc xdebug yaf" \ + PHP_EXTENSIONS_FUTURE="intl sockets" # docker-* COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -41,8 +43,8 @@ RUN \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ - && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ - && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ + && docker-pecl-ext-install $PECL_EXTENSIONS \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ From 2d7702170499fe77953e56556f95804e813dd4a3 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 21 Oct 2022 17:50:14 +0700 Subject: [PATCH 193/311] fix: bad scoping prevented ext install --- docker-pecl-ext-install | 8 ++++---- docker-php-ext-install-if | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index 74d98c4..f8b61bf 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -23,11 +23,11 @@ done xmodules= for module in $modules; do mod=$(echo $module | sed -E 's/\-[^ ]+//g') - php -m | grep -q $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true - (ls $extDir/$mod.so >/dev/null && echo "$module already installed") \ - || ([[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module") + php -m | grep -iq $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true + { ls $extDir/$mod.so >/dev/null 2>&1 && echo "$module already installed"; } \ + || { [[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module"; } done [[ "" = "$xmodules" ]] && exit 0 echo "pecl install $xmodules" -pecl install $xmodules > /dev/null +yes '' | pecl install $xmodules > /dev/null diff --git a/docker-php-ext-install-if b/docker-php-ext-install-if index 47e5b6d..1b7f88b 100755 --- a/docker-php-ext-install-if +++ b/docker-php-ext-install-if @@ -15,11 +15,11 @@ done xmodules= for module in $modules; do mod=$(echo $module | sed -E 's/\-[^ ]+//g') - php -m | grep -q $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true - (ls $extDir/$mod.so >/dev/null && echo "$module already installed") \ - || ([[ "" != "$modules" ]] && modules="$modules $module" || modules="$module") + php -m | grep -iq $mod || docker-php-ext-enable $mod >/dev/null 2>&1 || true + { ls $extDir/$mod.so >/dev/null 2>&1 && echo "$module already installed"; } \ + || { [[ "" != "$xmodules" ]] && xmodules="$xmodules $module" || xmodules="$module"; } done [[ "" = "$xmodules" ]] && exit 0 echo "docker-php-ext-install $xmodules" -docker-php-ext-install $xmodules > /dev/null +yes '' | docker-php-ext-install $xmodules > /dev/null From 326dad3695cf77c9c2b8460e08af7757f9cb05ff Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 21 Oct 2022 17:50:41 +0700 Subject: [PATCH 194/311] refactor: 'yes' no longer required --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 1526ddc..3b24e24 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -40,7 +40,7 @@ RUN \ # php extensions && docker-php-source extract \ && pecl channel-update pecl.php.net \ - && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS \ + && docker-pecl-ext-install $PECL_EXTENSIONS \ && cd /usr/src/php/ext/ \ && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 08b62bb..5304ee5 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -41,7 +41,7 @@ RUN \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ - && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ + && docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole diff --git a/8.1.Dockerfile b/8.1.Dockerfile index b0a3ef1..658a99a 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -41,7 +41,7 @@ RUN \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ - && yes '' | docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ + && docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole From c0dbc4aeb6363641004f58493c801d14375ed828 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 21 Oct 2022 18:07:21 +0700 Subject: [PATCH 195/311] chore(build): donot tag 3.13 anymore [skip ci][ci skip] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecbe7e6..ffc7d00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: with: push: true file: 8.0.Dockerfile - tags: adhocore/phpfpm:8.0-alp3.13,adhocore/phpfpm:8.0 + tags: adhocore/phpfpm:8.0 - name: "[7.4] Build and push" id: docker_build_74 @@ -42,7 +42,7 @@ jobs: with: push: true file: 7.4.Dockerfile - tags: adhocore/phpfpm:7.4-alp3.13,adhocore/phpfpm:7.4 + tags: adhocore/phpfpm:7.4 - name: "[8.2] Build and push" id: docker_build_82 From 857968cc48f1ac65fbc89c8bdce21852059a8d93 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 21 Oct 2022 18:14:20 +0700 Subject: [PATCH 196/311] chore(workflow): unfurl pull step [skip ci][ci skip] --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffc7d00..c7be944 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,12 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: "Pull" - run: docker pull adhocore/phpfpm:7.4 && docker pull adhocore/phpfpm:8.0 && docker pull adhocore/phpfpm:8.1 || true + - name: "Docker Pull" + run: | + docker pull adhocore/phpfpm:7.4 || true + docker pull adhocore/phpfpm:8.0 || true + docker pull adhocore/phpfpm:8.1 || true + docker pull adhocore/phpfpm:8.2 || true - name: "[8.1] Build and push" id: docker_build_81 From 43469dc9a191c1245dd2a7b4d93016d81793735c Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 21 Oct 2022 18:58:19 +0700 Subject: [PATCH 197/311] docs: fix composer info [skip ci][ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07e82b4..136cc95 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). It comes prepackaged with `composer` - both v1 and v2. -Use `composer2` command for v2 and `composer` for v1. +Use `composer` command for v2 and `composer1` for v1. ## Usage From 4cc2eed16d6d15d057133dbc88c6bf7350807d79 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 23 Oct 2022 15:21:43 +0700 Subject: [PATCH 198/311] docs: update ext lists [skip ci][ci skip] --- README.md | 165 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 136cc95..ebe2238 100644 --- a/README.md +++ b/README.md @@ -71,34 +71,63 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. +#### PHP8.2 + +The following PHP extensions are installed in `adhocore/phpfpm:8.2`: + +``` +PHP 8.2.0RC4, Total extensions: 82 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - iconv - igbinary - imagick +- imap - intl - json - ldap +- libxml - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - psr - random - rdkafka +- readline - redis - reflection - session +- shmop - simdjson - simplexml - soap +- sodium - spl - sqlite3 - ssh2 +- standard - sysvmsg - sysvsem - sysvshm +- tidy - tokenizer - uuid - xdebug +- xhprof - xlswriter - xml - xmlreader +- xmlwriter - xsl - yaml - zend opcache +- zip - zlib +``` + #### PHP8.1 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -Total: 85 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phar -- posix - pspell - psr - rdkafka -- readline - redis - reflection - session -- shmop - simdjson - simplexml - soap -- sockets - sodium - spl - sqlite3 -- ssh2 - standard - swoole - sysvmsg -- sysvsem - sysvshm - tidy - tokenizer -- uuid - xdebug - xhprof - xlswriter -- xml - xmlreader - xmlwriter - xsl -- yaf - yaml - zend opcache - zip -- zlib +PHP 8.1.11, Total extensions: 86 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phalcon +- phar - posix - pspell - psr +- rdkafka - readline - redis - reflection +- session - shmop - simdjson - simplexml +- soap - sockets - sodium - spl +- sqlite3 - ssh2 - standard - swoole +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - uuid - xdebug - xhprof +- xlswriter - xml - xmlreader - xmlwriter +- xsl - yaf - yaml - zend opcache +- zip - zlib ``` #### PHP8.0 @@ -106,29 +135,29 @@ Total: 85 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -Total: 85 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phar -- posix - pspell - psr - rdkafka -- readline - redis - reflection - session -- shmop - simdjson - simplexml - soap -- sockets - sodium - spl - sqlite3 -- ssh2 - standard - swoole - sysvmsg -- sysvsem - sysvshm - tidy - tokenizer -- uuid - xdebug - xhprof - xlswriter -- xml - xmlreader - xmlwriter - xsl -- yaf - yaml - zend opcache - zip -- zlib +PHP 8.0.24, Total extensions: 86 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phalcon +- phar - posix - pspell - psr +- rdkafka - readline - redis - reflection +- session - shmop - simdjson - simplexml +- soap - sockets - sodium - spl +- sqlite3 - ssh2 - standard - swoole +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - uuid - xdebug - xhprof +- xlswriter - xml - xmlreader - xmlwriter +- xsl - yaf - yaml - zend opcache +- zip - zlib ``` #### PHP7.4 @@ -136,28 +165,28 @@ Total: 85 The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` -Total: 87 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- event - exif - fileinfo - filter -- fpm - ftp - gd - gettext -- gmp - grpc - hash - hrtime -- iconv - igbinary - imagick - imap -- intl - json - ldap - libxml -- lua - lzf - mbstring - memcached -- mongodb - msgpack - mysqli - mysqlnd -- oauth - openssl - pcntl - pcov -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phalcon - phar -- posix - psr - rdkafka - readline -- redis - reflection - session - simdjson -- simplexml - soap - sockets - sodium -- spl - sqlite3 - ssh2 - standard -- swoole - sysvmsg - sysvsem - sysvshm -- tideways_xhprof - tidy - tokenizer - uuid -- xdebug - xlswriter - xml - xmlreader -- xmlwriter - yaf - yaml - zend opcache +PHP 7.4.32, Total extensions: 87 +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- event - exif - fileinfo - filter +- fpm - ftp - gd - gettext +- gmp - grpc - hash - hrtime +- iconv - igbinary - imagick - imap +- intl - json - ldap - libxml +- lua - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phalcon - phar +- posix - psr - rdkafka - readline +- redis - reflection - session - simdjson +- simplexml - soap - sockets - sodium +- spl - sqlite3 - ssh2 - standard +- swoole - sysvmsg - sysvsem - sysvshm +- tideways_xhprof - tidy - tokenizer - uuid +- xdebug - xlswriter - xml - xmlreader +- xmlwriter - yaf - yaml - zend opcache - zephir parser - zip - zlib ``` From 3086747d8adefecaf393907cbc116be5ff1ecfe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 22:12:02 +0000 Subject: [PATCH 199/311] build(deps): bump php Bumps php from 7.4.32-fpm-alpine3.15 to 8.1.12-fpm-alpine3.15. --- updated-dependencies: - dependency-name: php dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 8.2.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 3b24e24..c4a6ba5 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.32-fpm-alpine3.15 +FROM php:8.1.12-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 5304ee5..bcffcf2 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.24-fpm-alpine3.15 +FROM php:8.1.12-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 658a99a..97452ee 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.11-fpm-alpine3.15 +FROM php:8.1.12-fpm-alpine3.15 MAINTAINER Jitendra Adhikari diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 0da52bc..6e9ba60 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0RC4-fpm-alpine3.15 +FROM php:8.2.0RC5-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 7649dff4fe425783bc6ba730912752b528011cd4 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 30 Oct 2022 19:20:41 +0700 Subject: [PATCH 200/311] Restore 7.4.Dockerfile --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index c4a6ba5..3b24e24 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.12-fpm-alpine3.15 +FROM php:7.4.32-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 6274c9683a61b4a9e04815b167aef4cb0365a60f Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 30 Oct 2022 19:20:52 +0700 Subject: [PATCH 201/311] Restore 8.0.Dockerfile --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index bcffcf2..5304ee5 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.12-fpm-alpine3.15 +FROM php:8.0.24-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 14a78aba84003f15219ba794d256c4483fbe0bdf Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:19:03 +0700 Subject: [PATCH 202/311] feat: bump 8.0 to 8.0.25 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 5304ee5..eeb5bc1 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.24-fpm-alpine3.15 +FROM php:8.0.25-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 8c0bbd0b55c3512041abc5525132d67fc74a148d Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 5 Nov 2022 10:16:00 +0700 Subject: [PATCH 203/311] feat: update 7.4 to 7.4.33 --- 7.4.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 3b24e24..14fde64 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.32-fpm-alpine3.15 +FROM php:7.4.33-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From b054c2be3d88859afab66890b48254a6e47bd875 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sun, 13 Nov 2022 16:35:42 +0700 Subject: [PATCH 204/311] feat: bump 8.2 to 8.2rc6 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 6e9ba60..308dac0 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0RC5-fpm-alpine3.15 +FROM php:8.2.0RC6-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 78224dd9ca1efbc37e6d14aa2854ead762bf24be Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Tue, 29 Nov 2022 19:13:43 +0700 Subject: [PATCH 205/311] feat: bump 8.1 to 8.1.13 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 97452ee..195a4ca 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.12-fpm-alpine3.15 +FROM php:8.1.13-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 2ab7048a8822498d6e9c4f138a3a62dce716a86e Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Tue, 29 Nov 2022 19:14:37 +0700 Subject: [PATCH 206/311] feat: bump 8.0 to 8.0.26 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index eeb5bc1..3470af0 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.25-fpm-alpine3.15 +FROM php:8.0.26-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From d17f15277ea48edab66eb06f752832483b8072f8 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 3 Dec 2022 07:35:26 +0700 Subject: [PATCH 207/311] docs: bump [skip ci][ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ebe2238..9de5ba1 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.1.11 and PHP8.0.24 with plenty of common and useful extensions. +It contains PHP8.1.13 and PHP8.0.26 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.30. +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From 822ca4bb074ee2792e6acb6d16bbbde46ddad830 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 22 Dec 2022 09:11:13 +0700 Subject: [PATCH 208/311] feat: bump 8.2rc to 8.2.0 --- 8.2.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 308dac0..523af60 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0RC6-fpm-alpine3.15 +FROM php:8.2.0-fpm-alpine3.16 MAINTAINER Jitendra Adhikari @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From d085a2b220f015e34a0a343e39a68e2ae1545154 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 29 Dec 2022 04:48:45 +0700 Subject: [PATCH 209/311] docs: versions [skip ci][ci skip] --- README.md | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 9de5ba1..9fced8e 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.1.13 and PHP8.0.26 with plenty of common and useful extensions. +It contains PHP8.2.0, PHP8.1.13 and PHP8.0.26 with plenty of common and useful extensions. -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33. +You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -24,6 +24,9 @@ Use `composer` command for v2 and `composer1` for v1. To pull latest image: ```sh +docker pull adhocore/phpfpm:8.2 + +# or for 8.1 docker pull adhocore/phpfpm:8.1 # or for php 8.0 @@ -33,14 +36,6 @@ docker pull adhocore/phpfpm:8.0 docker pull adhocore/phpfpm:7.4 ``` -#### 8.2RC - -8.2 is release candidate and not yet production ready, but of course you can test/develop on it locally. - -```sh -docker pull adhocore/phpfpm:8.2 -``` - To use in docker-compose ```yaml # ./docker-compose.yml @@ -76,7 +71,7 @@ Below you can find list of extensions by image tags. The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` -PHP 8.2.0RC4, Total extensions: 82 +PHP 8.2.0, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -105,7 +100,7 @@ PHP 8.2.0RC4, Total extensions: 82 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -PHP 8.1.11, Total extensions: 86 +PHP 8.1.13, Total extensions: 86 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -135,7 +130,7 @@ PHP 8.1.11, Total extensions: 86 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -PHP 8.0.24, Total extensions: 86 +PHP 8.0.26, Total extensions: 86 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -165,7 +160,7 @@ PHP 8.0.24, Total extensions: 86 The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` -PHP 7.4.32, Total extensions: 87 +PHP 7.4.33, Total extensions: 87 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev From 19445441332d8317df656ace7646f5b2bc47d9f1 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 29 Dec 2022 04:51:27 +0700 Subject: [PATCH 210/311] docs: on ext disable [skip ci][ci skip] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9fced8e..45dd4f9 100644 --- a/README.md +++ b/README.md @@ -192,15 +192,15 @@ Read more about ### Production Usage For production you may want to get rid of some extensions that are not really required. -In such case, you can build a custom image on top `adhocore/phpfpm:8.0` like so: +In such case, you can build a custom image on top `adhocore/phpfpm:8.2` like so: ```Dockerfile -FROM adhocore/phpfpm:8.0 +FROM adhocore/phpfpm:8.2 # or 8.1 or 8.0 # Disable extensions you won't need. You can add as much as you want separated by space. RUN docker-php-ext-disable xdebug pcov ldap ``` -> `docker-php-ext-disable` is shell script available in `adhocore/phpfpm:8.0` only and not in official PHP docker images. +> `docker-php-ext-disable` is shell script available in `adhocore/phpfpm` only and not in official PHP docker images. > Extensions disabled can be re enabled with `docker-php-ext-enable` later again without the overhead of recompiling/rebuilding all over again. From ef153399738d7672cfec8f1c77fca58d4a7b7f43 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 18 Jan 2023 05:08:34 +0700 Subject: [PATCH 211/311] feat: bump 8.2 to 8.2.1 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 523af60..2f04edf 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0-fpm-alpine3.16 +FROM php:8.2.1-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From b3ea106fe303f3159b3b3cda71bacef99440d611 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 18 Jan 2023 05:09:27 +0700 Subject: [PATCH 212/311] feat: bump 8.1 to 8.1.14 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 195a4ca..3309907 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.13-fpm-alpine3.15 +FROM php:8.1.14-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 9c600efaa32c5fe3af315b6d8ce3f413ae8d84f8 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Wed, 18 Jan 2023 05:11:01 +0700 Subject: [PATCH 213/311] feat: bump 8.0 to 8.0.27 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 3470af0..741f5b5 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.26-fpm-alpine3.15 +FROM php:8.0.27-fpm-alpine3.15 MAINTAINER Jitendra Adhikari From 0c4ecf0c80c2a09a26aa6db8903d4835f3f4d412 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 19 Jan 2023 08:13:10 +0700 Subject: [PATCH 214/311] fix: alpine version --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 3309907..03be15b 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.14-fpm-alpine3.15 +FROM php:8.1.14-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 570b26d310b5f5e9dfdd35bce28a016b24ab815c Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 19 Jan 2023 08:13:41 +0700 Subject: [PATCH 215/311] fix: alpine version --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 741f5b5..011f34d 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.27-fpm-alpine3.15 +FROM php:8.0.27-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From e94cc26e7553c07c74e59630b73c8d1a5b446cf5 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 4 Feb 2023 14:40:37 +0700 Subject: [PATCH 216/311] feat: bump 8.2 to 8.2.2 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 2f04edf..7ab6f07 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.1-fpm-alpine3.16 +FROM php:8.2.2-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From c9693323882a2b2cbf9177981a1af0a2105edbf3 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 4 Feb 2023 14:41:21 +0700 Subject: [PATCH 217/311] feat: bump 8.1 to 8.1.15 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 03be15b..3acbe86 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.14-fpm-alpine3.16 +FROM php:8.1.15-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 8988c455babf284d339d1def80277b86e63a72b7 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:47:08 +0700 Subject: [PATCH 218/311] feat: bump php8.0 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 011f34d..34192a8 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.27-fpm-alpine3.16 +FROM php:8.0.28-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 8281d423847c38f98ca19bf930c8140d2c6c0af7 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:47:38 +0700 Subject: [PATCH 219/311] feat: bump php8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 3acbe86..61e619f 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.15-fpm-alpine3.16 +FROM php:8.1.16-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 3cfe5b813c0aee5e6607b7bc7edd653705841282 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:48:07 +0700 Subject: [PATCH 220/311] feat: bump php8.2 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 7ab6f07..99c62df 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.2-fpm-alpine3.16 +FROM php:8.2.3-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 16ba827e280e8cc61b8829081257847a85a86911 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 17 Mar 2023 19:50:11 +0700 Subject: [PATCH 221/311] fix: intl ext breaks with cache [issue #80] --- 8.0.Dockerfile | 1 + 8.1.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 34192a8..d4df32b 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -38,6 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20200930/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 61e619f..dcddbed 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -38,6 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ From a85a379284bb406d45e50595c4e12fffaf404600 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 17 Mar 2023 19:52:38 +0700 Subject: [PATCH 222/311] build(workflow): build 8.2 first [skip ci][ci skip] --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7be944..fbf35c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,14 @@ jobs: docker pull adhocore/phpfpm:8.1 || true docker pull adhocore/phpfpm:8.2 || true + - name: "[8.2] Build and push" + id: docker_build_82 + uses: docker/build-push-action@v2 + with: + push: true + file: 8.2.Dockerfile + tags: adhocore/phpfpm:8.2 + - name: "[8.1] Build and push" id: docker_build_81 uses: docker/build-push-action@v2 @@ -47,11 +55,3 @@ jobs: push: true file: 7.4.Dockerfile tags: adhocore/phpfpm:7.4 - - - name: "[8.2] Build and push" - id: docker_build_82 - uses: docker/build-push-action@v2 - with: - push: true - file: 8.2.Dockerfile - tags: adhocore/phpfpm:8.2 From 52f6e7a6cdb47d94494f108d2b0cd5a96a5fd222 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:05:30 +0700 Subject: [PATCH 223/311] perf: restore cache for 8.2 --- 8.2.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 99c62df..585e82c 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From c42afe368eeea865566bef038a2746321d35fa74 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari Date: Fri, 17 Mar 2023 20:12:49 +0700 Subject: [PATCH 224/311] perf: restore intl cache --- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index d4df32b..d3b4e96 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -38,7 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20200930/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ +# && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20200930/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index dcddbed..8773ccd 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -38,7 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ +# && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ From fcfd58dc01bccd83f328d207abbcb001517002c5 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:18:08 +0700 Subject: [PATCH 225/311] docs: [skip ci] --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 45dd4f9..1133249 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ ## docker-phpfpm [![Docker build](https://github.com/adhocore/docker-phpfpm/actions/workflows/build.yml/badge.svg)](https://github.com/adhocore/docker-phpfpm/actions/workflows/build.yml) -[![Donate 15](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+15)](https://www.paypal.me/ji10/15usd) -[![Donate 25](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+25)](https://www.paypal.me/ji10/25usd) -[![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Production+ready+PHP7+and+PHP8+docker+images+with+plenty+extensions&url=https://github.com/adhocore/docker-phpfpm&hashtags=docker,dockerimage,php7,php8,phpext) +[![Support](https://img.shields.io/static/v1?label=Support&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/adhocore) + Docker PHP FPM with lean alpine base. The download size is just about ~150MB. From de550bce8df467399de8a75714404b277295c765 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:16:08 +0700 Subject: [PATCH 226/311] feat: bump php 8.2 to 8.2.4 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 585e82c..d29add2 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.3-fpm-alpine3.16 +FROM php:8.2.4-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 574c7c78a2aad329309382d5e981778c93b218ac Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:17:10 +0700 Subject: [PATCH 227/311] feat: bump php 8.1.x to 8.1.17 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 8773ccd..c0efe17 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.16-fpm-alpine3.16 +FROM php:8.1.17-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 121552e273a0dadf5a369317ce3bf1971d596da4 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:18:17 +0700 Subject: [PATCH 228/311] docs: bump versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1133249..338e407 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Docker PHP FPM with lean alpine base. The download size is just about ~150MB. -It contains PHP8.2.0, PHP8.1.13 and PHP8.0.26 with plenty of common and useful extensions. +It contains PHP8.2.4, PHP8.1.17 and PHP8.0.28 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. From f0c893a98d671b5ed46732b7372a83fb24dd119d Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 8 Apr 2023 08:59:10 +0700 Subject: [PATCH 229/311] build: try arm arch --- .github/workflows/build.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbf35c6..a75d24d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,14 @@ jobs: docker: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -26,32 +30,36 @@ jobs: - name: "[8.2] Build and push" id: docker_build_82 - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: push: true file: 8.2.Dockerfile tags: adhocore/phpfpm:8.2 + platforms: linux/amd64,linux/arm64 - name: "[8.1] Build and push" id: docker_build_81 - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: push: true file: 8.1.Dockerfile tags: adhocore/phpfpm:8.1 + platforms: linux/amd64,linux/arm64 - name: "[8.0] Build and push" id: docker_build_80 - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: push: true file: 8.0.Dockerfile tags: adhocore/phpfpm:8.0 + platforms: linux/amd64,linux/arm64 - name: "[7.4] Build and push" id: docker_build_74 - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: push: true file: 7.4.Dockerfile tags: adhocore/phpfpm:7.4 + platforms: linux/amd64,linux/arm64 From 2ee7259d3cb423fcf52a05e2b8086e0dd8999e11 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 8 Apr 2023 09:02:06 +0700 Subject: [PATCH 230/311] build: disable swoole/phalcon/grpc, optimize build --- .github/workflows/{build.yml => build-arm.yml} | 2 +- 7.4.Dockerfile | 18 +++++++++--------- 8.0.Dockerfile | 14 +++++++------- 8.1.Dockerfile | 17 ++++++++--------- 8.2.Dockerfile | 4 ++-- docker-pecl-ext-install | 2 +- docker-php-ext-install-if | 2 +- 7 files changed, 29 insertions(+), 30 deletions(-) rename .github/workflows/{build.yml => build-arm.yml} (99%) diff --git a/.github/workflows/build.yml b/.github/workflows/build-arm.yml similarity index 99% rename from .github/workflows/build.yml rename to .github/workflows/build-arm.yml index a75d24d..b3f257d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-arm.yml @@ -1,4 +1,4 @@ -name: build +name: build-arm on: workflow_dispatch: diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 14fde64..b07769b 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -9,7 +9,7 @@ ENV \ SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov phalcon psr rdkafka redis \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov phalcon psr rdkafka redis \ simdjson ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ PECL_BUNDLE="memcached event" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ @@ -19,8 +19,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:7.4 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ -COPY --from=adhocore/phpfpm:7.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:7.4 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ +#COPY --from=adhocore/phpfpm:7.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -45,13 +45,13 @@ RUN \ && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ # swoole - && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz); } \ + # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ + # && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ + # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ + # && rm -f swoole.tar.gz swoole_async.tar.gz); } \ # zephir_parser - && { php -m | grep swoole || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + && { php -m | grep zephir_parser || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ && tar xzf zephir_parser.tar.gz \ && rm -f zephir_parser.tar.gz \ && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser); } \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index d3b4e96..345b0e7 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev imagick ssh2-1.3.1 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds grpc igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -16,8 +16,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.0 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ -COPY --from=adhocore/phpfpm:8.0 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.0 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ +#COPY --from=adhocore/phpfpm:8.0 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -46,12 +46,12 @@ RUN \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ && cd /usr/src/php/ext/ \ # swoole - && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole); } \ + # && rm -f swoole.tar.gz swoole_async.tar.gz \ + # && docker-php-ext-install -j "$(nproc)" swoole); } \ && { pecl clear-cache || true; } \ && docker-php-ext-disable xdebug \ && docker-php-source delete \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index c0efe17..09a7bdc 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ - PECL_EXTENSIONS="apcu ast ds ev grpc igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ + PECL_EXTENSIONS="apcu ast ds ev igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -16,8 +16,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +#COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -38,20 +38,19 @@ RUN \ # # php extensions && docker-php-source extract \ -# && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ && docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ - && cd /usr/src/php/ext/ \ + # && cd /usr/src/php/ext/ \ # swoole - && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ + # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ + # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - && rm -f swoole.tar.gz swoole_async.tar.gz \ - && docker-php-ext-install -j "$(nproc)" swoole); } \ + # && rm -f swoole.tar.gz swoole_async.tar.gz \ + # && docker-php-ext-install -j "$(nproc)" swoole); } \ && { pecl clear-cache || true; } \ && docker-php-ext-disable xdebug \ && docker-php-source delete \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index d29add2..f3dc1fc 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index f8b61bf..73662f4 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -30,4 +30,4 @@ done [[ "" = "$xmodules" ]] && exit 0 echo "pecl install $xmodules" -yes '' | pecl install $xmodules > /dev/null +yes '' | MAKEFLAGS="-j $(nproc)" pecl install $xmodules diff --git a/docker-php-ext-install-if b/docker-php-ext-install-if index 1b7f88b..32190fe 100755 --- a/docker-php-ext-install-if +++ b/docker-php-ext-install-if @@ -22,4 +22,4 @@ done [[ "" = "$xmodules" ]] && exit 0 echo "docker-php-ext-install $xmodules" -yes '' | docker-php-ext-install $xmodules > /dev/null +yes '' | MAKEFLAGS="-j $(nproc)" docker-php-ext-install -j "$(nproc)" $xmodules From 30da67be09b9bcf2e7763d822cd62b825bf7c241 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 10 Apr 2023 21:41:39 +0700 Subject: [PATCH 231/311] docs: on removing swoole/phalcon/grpc [skip ci][ci skip] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 338e407..1d6d1f8 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![Donate 25](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+25)](https://www.paypal.me/ji10/25usd) [![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) --> +**Important Note**: To be able to support arm builds ([#81](https://github.com/adhocore/docker-phpfpm/issues/81)) we removed some big and slow to compile extensions like swoole/grpc for now. Docker PHP FPM with lean alpine base. The download size is just about ~150MB. From 1e4cec3ff2a4a7dce49573a2af9bd20fe3d628f1 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Mon, 10 Apr 2023 21:44:02 +0700 Subject: [PATCH 232/311] build(workflow): rename to build [skip ci][ci skip] --- .github/workflows/{build-arm.yml => build.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{build-arm.yml => build.yml} (99%) diff --git a/.github/workflows/build-arm.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/build-arm.yml rename to .github/workflows/build.yml index b3f257d..a75d24d 100644 --- a/.github/workflows/build-arm.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: build-arm +name: build on: workflow_dispatch: From cc573c24aaa0cdfbc8cfdd988b560808e240f5c2 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:12:50 +0700 Subject: [PATCH 233/311] refactor: reuse cache, disable phalcon, update docs --- 7.4.Dockerfile | 21 +++---- 8.0.Dockerfile | 6 +- 8.1.Dockerfile | 4 +- 8.2.Dockerfile | 8 +-- README.md | 168 ++++++++++++++++++++++++------------------------- 5 files changed, 102 insertions(+), 105 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index b07769b..fd73b7d 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -9,11 +9,10 @@ ENV \ SWOOLE_VERSION=4.6.7 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov phalcon psr rdkafka redis \ - simdjson ssh2-1.2 uuid xdebug xlswriter yaf yaml" \ - PECL_BUNDLE="memcached event" \ + PECL_EXTENSIONS="apcu ast ds ev hrtime igbinary imagick lzf lua mongodb memcached msgpack oauth pcov psr rdkafka redis \ + simdjson ssh2-1.2 uuid xdebug-3.1.6 xlswriter yaf yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ - soap sockets swoole sysvshm sysvmsg sysvsem tidy zip zephir_parser" + soap sockets sysvshm sysvmsg sysvsem tidy zip" # docker-* COPY docker-* /usr/local/bin/ @@ -41,8 +40,6 @@ RUN \ && docker-php-source extract \ && pecl channel-update pecl.php.net \ && docker-pecl-ext-install $PECL_EXTENSIONS \ - && cd /usr/src/php/ext/ \ - && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ # swoole # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ @@ -51,16 +48,16 @@ RUN \ # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ # && rm -f swoole.tar.gz swoole_async.tar.gz); } \ # zephir_parser - && { php -m | grep zephir_parser || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ - && tar xzf zephir_parser.tar.gz \ - && rm -f zephir_parser.tar.gz \ - && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser); } \ + # && { php -m | grep zephir_parser || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ + # && tar xzf zephir_parser.tar.gz \ + # && rm -f zephir_parser.tar.gz \ + # && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser); } \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ - && docker-php-ext-install-if $PHP_EXTENSIONS $PECL_BUNDLE \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ && cd /usr/local/etc/php/conf.d/ \ && { mv docker-php-ext-event.ini docker-php-ext-zevent.ini || true; } \ && { pecl clear-cache || true; } \ - && docker-php-ext-disable xdebug \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ && docker-php-source delete \ # # tideways_xhprof diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 345b0e7..3ebe7bc 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -8,7 +8,7 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev imagick ssh2-1.3.1 xlswriter yaf" \ - PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov phalcon psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ + PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql pdo_pgsql \ pspell shmop soap sockets sysvshm sysvmsg sysvsem tidy xsl zip" @@ -16,8 +16,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.0 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ -#COPY --from=adhocore/phpfpm:8.0 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.0 /usr/local/lib/php/extensions/no-debug-non-zts-20200930/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ +COPY --from=adhocore/phpfpm:8.0 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 09a7bdc..08a758a 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -16,8 +16,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -#COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php diff --git a/8.2.Dockerfile b/8.2.Dockerfile index f3dc1fc..5f98b21 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -8,18 +8,18 @@ ENV \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev igbinary imagick lzf memcached mongodb msgpack oauth pcov \ - psr redis rdkafka simdjson ssh2-1.3.1 uuid xhprof xlswriter yaml" \ + psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql \ pdo_pgsql pspell shmop soap sysvshm sysvmsg sysvsem tidy xsl zip" \ - PECL_EXTENSIONS_FUTURE="grpc xdebug yaf" \ + PECL_EXTENSIONS_FUTURE="grpc yaf" \ PHP_EXTENSIONS_FUTURE="intl sockets" # docker-* COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php diff --git a/README.md b/README.md index 1d6d1f8..1c86101 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Donate 25](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+25)](https://www.paypal.me/ji10/25usd) [![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) --> -**Important Note**: To be able to support arm builds ([#81](https://github.com/adhocore/docker-phpfpm/issues/81)) we removed some big and slow to compile extensions like swoole/grpc for now. +**Important Note**: To be able to support arm builds ([#81](https://github.com/adhocore/docker-phpfpm/issues/81)) we removed some big and slow to compile extensions like swoole/grpc/phalcon for now. Docker PHP FPM with lean alpine base. The download size is just about ~150MB. @@ -74,26 +74,26 @@ The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` PHP 8.2.0, Total extensions: 82 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- hash - iconv - igbinary - imagick -- imap - intl - json - ldap -- libxml - lzf - mbstring - memcached -- mongodb - msgpack - mysqli - mysqlnd -- oauth - openssl - pcntl - pcov -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phar - posix -- pspell - psr - random - rdkafka -- readline - redis - reflection - session -- shmop - simdjson - simplexml - soap -- sodium - spl - sqlite3 - ssh2 -- standard - sysvmsg - sysvsem - sysvshm -- tidy - tokenizer - uuid - xdebug -- xhprof - xlswriter - xml - xmlreader -- xmlwriter - xsl - yaml - zend opcache +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - iconv - igbinary - imagick +- imap - intl - json - ldap +- libxml - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - psr - random - rdkafka +- readline - redis - reflection - session +- shmop - simdjson - simplexml - soap +- sodium - spl - sqlite3 - ssh2 +- standard - sysvmsg - sysvsem - sysvshm +- tidy - tokenizer - uuid - xdebug +- xhprof - xlswriter - xml - xmlreader +- xmlwriter - xsl - yaml - zend opcache - zip - zlib ``` @@ -103,27 +103,27 @@ The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` PHP 8.1.13, Total extensions: 86 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phalcon -- phar - posix - pspell - psr -- rdkafka - readline - redis - reflection -- session - shmop - simdjson - simplexml -- soap - sockets - sodium - spl -- sqlite3 - ssh2 - standard - swoole -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - uuid - xdebug - xhprof -- xlswriter - xml - xmlreader - xmlwriter -- xsl - yaf - yaml - zend opcache +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phalcon +- phar - posix - pspell - psr +- rdkafka - readline - redis - reflection +- session - shmop - simdjson - simplexml +- soap - sockets - sodium - spl +- sqlite3 - ssh2 - standard - swoole +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - uuid - xdebug - xhprof +- xlswriter - xml - xmlreader - xmlwriter +- xsl - yaf - yaml - zend opcache - zip - zlib ``` @@ -133,27 +133,27 @@ The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` PHP 8.0.26, Total extensions: 86 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phalcon -- phar - posix - pspell - psr -- rdkafka - readline - redis - reflection -- session - shmop - simdjson - simplexml -- soap - sockets - sodium - spl -- sqlite3 - ssh2 - standard - swoole -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - uuid - xdebug - xhprof -- xlswriter - xml - xmlreader - xmlwriter -- xsl - yaf - yaml - zend opcache +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- grpc - hash - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lzf - mbstring +- memcached - mongodb - msgpack - mysqli +- mysqlnd - oauth - openssl - pcntl +- pcov - pcre - pdo - pdo_mysql +- pdo_pgsql - pdo_sqlite - pgsql - phalcon +- phar - posix - pspell - psr +- rdkafka - readline - redis - reflection +- session - shmop - simdjson - simplexml +- soap - sockets - sodium - spl +- sqlite3 - ssh2 - standard - swoole +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - uuid - xdebug - xhprof +- xlswriter - xml - xmlreader - xmlwriter +- xsl - yaf - yaml - zend opcache - zip - zlib ``` @@ -163,27 +163,27 @@ The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` PHP 7.4.33, Total extensions: 87 -- apcu - ast - bcmath - bz2 -- calendar - core - ctype - curl -- date - dom - ds - ev -- event - exif - fileinfo - filter -- fpm - ftp - gd - gettext -- gmp - grpc - hash - hrtime -- iconv - igbinary - imagick - imap -- intl - json - ldap - libxml -- lua - lzf - mbstring - memcached -- mongodb - msgpack - mysqli - mysqlnd -- oauth - openssl - pcntl - pcov -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phalcon - phar -- posix - psr - rdkafka - readline -- redis - reflection - session - simdjson -- simplexml - soap - sockets - sodium -- spl - sqlite3 - ssh2 - standard -- swoole - sysvmsg - sysvsem - sysvshm -- tideways_xhprof - tidy - tokenizer - uuid -- xdebug - xlswriter - xml - xmlreader -- xmlwriter - yaf - yaml - zend opcache +- apcu - ast - bcmath - bz2 +- calendar - core - ctype - curl +- date - dom - ds - ev +- event - exif - fileinfo - filter +- fpm - ftp - gd - gettext +- gmp - grpc - hash - hrtime +- iconv - igbinary - imagick - imap +- intl - json - ldap - libxml +- lua - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phalcon - phar +- posix - psr - rdkafka - readline +- redis - reflection - session - simdjson +- simplexml - soap - sockets - sodium +- spl - sqlite3 - ssh2 - standard +- swoole - sysvmsg - sysvsem - sysvshm +- tideways_xhprof - tidy - tokenizer - uuid +- xdebug - xlswriter - xml - xmlreader +- xmlwriter - yaf - yaml - zend opcache - zephir parser - zip - zlib ``` From f07edaeadf9fd2a7300d7670ab713be9b91561f3 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Tue, 11 Apr 2023 22:11:46 +0700 Subject: [PATCH 234/311] feat: bump 7.4's alpine, reuse cache --- 7.4.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index fd73b7d..03091ac 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.33-fpm-alpine3.15 +FROM php:7.4.33-fpm-alpine3.16 MAINTAINER Jitendra Adhikari @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:7.4 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ -#COPY --from=adhocore/phpfpm:7.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:7.4 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ +COPY --from=adhocore/phpfpm:7.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From 5295044f50b98d59713df096b5fb16b71c48ac37 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 14 Apr 2023 14:31:43 +0700 Subject: [PATCH 235/311] build: remove 7.4 from active build --- .github/workflows/build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a75d24d..c3be3ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,12 +54,3 @@ jobs: file: 8.0.Dockerfile tags: adhocore/phpfpm:8.0 platforms: linux/amd64,linux/arm64 - - - name: "[7.4] Build and push" - id: docker_build_74 - uses: docker/build-push-action@v4 - with: - push: true - file: 7.4.Dockerfile - tags: adhocore/phpfpm:7.4 - platforms: linux/amd64,linux/arm64 From f34a811aa27c918bf299743114b44ea50cc4f5fc Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 14 Apr 2023 14:33:24 +0700 Subject: [PATCH 236/311] feat: bump php 8.1 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 08a758a..3591593 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.17-fpm-alpine3.16 +FROM php:8.1.18-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 3edf1d979bdfaa82c432e01298163821019b04dc Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 14 Apr 2023 14:34:05 +0700 Subject: [PATCH 237/311] feat: bump php 8.2 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 5f98b21..bc1ee9a 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.4-fpm-alpine3.16 +FROM php:8.2.5-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 40f619c3581720a180cfecac2ea1adcf70a7ad8b Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:36:52 +0700 Subject: [PATCH 238/311] build: tag latest for 8.2 --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3be3ad..2095f04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,6 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: "Docker Pull" run: | - docker pull adhocore/phpfpm:7.4 || true docker pull adhocore/phpfpm:8.0 || true docker pull adhocore/phpfpm:8.1 || true docker pull adhocore/phpfpm:8.2 || true @@ -34,7 +33,7 @@ jobs: with: push: true file: 8.2.Dockerfile - tags: adhocore/phpfpm:8.2 + tags: adhocore/phpfpm:8.2,adhocore/phpfpm:latest platforms: linux/amd64,linux/arm64 - name: "[8.1] Build and push" From c1fc1e3b7c275c3ac263578b62e4e4d6469b5a61 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:37:30 +0700 Subject: [PATCH 239/311] chore: echo nproc used by ext installer --- docker-pecl-ext-install | 2 +- docker-php-ext-install-if | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index 73662f4..0e88bc8 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -29,5 +29,5 @@ for module in $modules; do done [[ "" = "$xmodules" ]] && exit 0 -echo "pecl install $xmodules" +echo "MAKEFLAGS='-j $(nproc)' pecl install $xmodules" yes '' | MAKEFLAGS="-j $(nproc)" pecl install $xmodules diff --git a/docker-php-ext-install-if b/docker-php-ext-install-if index 32190fe..f92fe27 100755 --- a/docker-php-ext-install-if +++ b/docker-php-ext-install-if @@ -21,5 +21,5 @@ for module in $modules; do done [[ "" = "$xmodules" ]] && exit 0 -echo "docker-php-ext-install $xmodules" +echo "MAKEFLAGS='-j $(nproc)' docker-php-ext-install $xmodules" yes '' | MAKEFLAGS="-j $(nproc)" docker-php-ext-install -j "$(nproc)" $xmodules From e246107f80dfe37fe0b55b4a6ed54f89e7bb000a Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:38:12 +0700 Subject: [PATCH 240/311] chore: cleanup unused commands --- 7.4.Dockerfile | 8 ++------ 8.0.Dockerfile | 10 +--------- 8.1.Dockerfile | 10 +--------- 8.2.Dockerfile | 11 +---------- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 03091ac..4a4ff69 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -40,13 +40,9 @@ RUN \ && docker-php-source extract \ && pecl channel-update pecl.php.net \ && docker-pecl-ext-install $PECL_EXTENSIONS \ + && cd /usr/local/lib/php/extensions/no-debug-non-zts-20190902 && rm -f intl.so mongodb.so && cd - \ + && cd /usr/local/etc/php/conf.d && rm -f *-intl.ini *-mongodb.ini && cd - \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ - # swoole - # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \ - # && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - # && rm -f swoole.tar.gz swoole_async.tar.gz); } \ # zephir_parser # && { php -m | grep zephir_parser || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ # && tar xzf zephir_parser.tar.gz \ diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 3ebe7bc..8b34461 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -44,16 +44,8 @@ RUN \ && docker-php-ext-install-if $PHP_EXTENSIONS \ && docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ - && cd /usr/src/php/ext/ \ - # swoole - # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - # && rm -f swoole.tar.gz swoole_async.tar.gz \ - # && docker-php-ext-install -j "$(nproc)" swoole); } \ && { pecl clear-cache || true; } \ - && docker-php-ext-disable xdebug \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ && docker-php-source delete \ # # composer diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 3591593..4ea44fa 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -43,16 +43,8 @@ RUN \ && docker-php-ext-install-if $PHP_EXTENSIONS \ && docker-pecl-ext-install $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS $PECL_EXTENSIONS_FUTURE | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ - # && cd /usr/src/php/ext/ \ - # swoole - # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ - # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - # && rm -f swoole.tar.gz swoole_async.tar.gz \ - # && docker-php-ext-install -j "$(nproc)" swoole); } \ && { pecl clear-cache || true; } \ - && docker-php-ext-disable xdebug \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ && docker-php-source delete \ # # composer diff --git a/8.2.Dockerfile b/8.2.Dockerfile index bc1ee9a..42e4390 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -45,16 +45,7 @@ RUN \ && docker-php-ext-install-if $PHP_EXTENSIONS \ && docker-pecl-ext-install $PECL_EXTENSIONS \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ - && cd /usr/src/php/ext/ \ - # swoole - # && { php -m | grep swoole || (curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \ - # && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \ - # # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \ - # # && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \ - # && rm -f swoole.tar.gz swoole_async.tar.gz \ - # && docker-php-ext-install -j "$(nproc)" swoole); } \ - # && { pecl clear-cache || true; } \ - && { docker-php-ext-disable xdebug || true; } \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ && docker-php-source delete \ # # composer From cd81e779bfa198021d9d3dd1203e33140ce194e9 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:38:41 +0700 Subject: [PATCH 241/311] docs: update ext list, add ext install guide/example --- README.md | 124 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 1c86101..f7a2f79 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ [![Donate 50](https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&label=donate+50)](https://www.paypal.me/ji10/50usd) --> **Important Note**: To be able to support arm builds ([#81](https://github.com/adhocore/docker-phpfpm/issues/81)) we removed some big and slow to compile extensions like swoole/grpc/phalcon for now. +Check [example](#extensions) below how to add them back in your images based off on `adhcore/phpfpm`. Docker PHP FPM with lean alpine base. The download size is just about ~150MB. @@ -63,7 +64,23 @@ Latest versions of both Composer v1 and v2 are installed already. You can run v2 ### Extensions -`xdebug` is installed but disabled by default for performance reason, +You can add new extensions in your image like so: +``` +FROM adhocore/phpfpm:8.1 # or 8.2, 8.0 + +RUN \ + # setup + apk add -U $PHPIZE_DEPS \ + # + # if it is in pecl: \ + && docker-pecl-ext-install grpc phalcon swoole \ + && apk del $PHPIZE_DEPS \ + # + # if it is in php ext: \ + && docker-php-source extract && docker-php-ext-install-if dba +``` + +Debug extension `xdebug` is installed but disabled by default for performance reason, just run `docker-php-ext-enable xdebug` to enable it again without having to rebuild/recompile. Below you can find list of extensions by image tags. @@ -73,7 +90,7 @@ Below you can find list of extensions by image tags. The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` -PHP 8.2.0, Total extensions: 82 +PHP >=8.2.5, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -102,29 +119,28 @@ PHP 8.2.0, Total extensions: 82 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -PHP 8.1.13, Total extensions: 86 +PHP >=8.1.18, Total extensions: 83 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev - exif - fileinfo - filter - fpm - ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phalcon -- phar - posix - pspell - psr -- rdkafka - readline - redis - reflection -- session - shmop - simdjson - simplexml -- soap - sockets - sodium - spl -- sqlite3 - ssh2 - standard - swoole -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - uuid - xdebug - xhprof -- xlswriter - xml - xmlreader - xmlwriter -- xsl - yaf - yaml - zend opcache -- zip - zlib +- hash - iconv - igbinary - imagick +- imap - intl - json - ldap +- libxml - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - psr - rdkafka - readline +- redis - reflection - session - shmop +- simdjson - simplexml - soap - sockets +- sodium - spl - sqlite3 - ssh2 +- standard - sysvmsg - sysvsem - sysvshm +- tidy - tokenizer - uuid - xdebug +- xhprof - xlswriter - xml - xmlreader +- xmlwriter - xsl - yaf - yaml +- zend opcache - zip - zlib ``` #### PHP8.0 @@ -132,29 +148,28 @@ PHP 8.1.13, Total extensions: 86 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -PHP 8.0.26, Total extensions: 86 +PHP >=8.0.28, Total extensions: 84 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev - exif - fileinfo - filter - fpm - ftp - gd - gettext - gmp -- grpc - hash - iconv - igbinary -- imagick - imap - intl - json -- ldap - libxml - lzf - mbstring -- memcached - mongodb - msgpack - mysqli -- mysqlnd - oauth - openssl - pcntl -- pcov - pcre - pdo - pdo_mysql -- pdo_pgsql - pdo_sqlite - pgsql - phalcon -- phar - posix - pspell - psr -- rdkafka - readline - redis - reflection -- session - shmop - simdjson - simplexml -- soap - sockets - sodium - spl -- sqlite3 - ssh2 - standard - swoole -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - uuid - xdebug - xhprof -- xlswriter - xml - xmlreader - xmlwriter -- xsl - yaf - yaml - zend opcache -- zip - zlib +- hash - iconv - igbinary - imagick +- imap - intl - json - ldap +- libxml - lzf - mbstring - memcached +- mongodb - msgpack - mysqli - mysqlnd +- oauth - openssl - pcntl - pcov +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phalcon - phar +- posix - pspell - psr - rdkafka +- readline - redis - reflection - session +- shmop - simdjson - simplexml - soap +- sockets - sodium - spl - sqlite3 +- ssh2 - standard - sysvmsg - sysvsem +- sysvshm - tidy - tokenizer - uuid +- xdebug - xhprof - xlswriter - xml +- xmlreader - xmlwriter - xsl - yaf +- yaml - zend opcache - zip - zlib ``` #### PHP7.4 @@ -162,29 +177,28 @@ PHP 8.0.26, Total extensions: 86 The following PHP extensions are installed in `adhocore/phpfpm:7.4`: ``` -PHP 7.4.33, Total extensions: 87 +PHP >=7.4.33, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev -- event - exif - fileinfo - filter -- fpm - ftp - gd - gettext -- gmp - grpc - hash - hrtime -- iconv - igbinary - imagick - imap -- intl - json - ldap - libxml -- lua - lzf - mbstring - memcached -- mongodb - msgpack - mysqli - mysqlnd -- oauth - openssl - pcntl - pcov -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phalcon - phar -- posix - psr - rdkafka - readline -- redis - reflection - session - simdjson -- simplexml - soap - sockets - sodium -- spl - sqlite3 - ssh2 - standard -- swoole - sysvmsg - sysvsem - sysvshm +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - hrtime - iconv - igbinary +- imagick - imap - intl - json +- ldap - libxml - lua - lzf +- mbstring - memcached - mongodb - msgpack +- mysqli - mysqlnd - oauth - openssl +- pcntl - pcov - pcre - pdo +- pdo_mysql - pdo_pgsql - pdo_sqlite - pgsql +- phar - posix - psr - rdkafka +- readline - redis - reflection - session +- simdjson - simplexml - soap - sockets +- sodium - spl - sqlite3 - ssh2 +- standard - sysvmsg - sysvsem - sysvshm - tideways_xhprof - tidy - tokenizer - uuid - xdebug - xlswriter - xml - xmlreader - xmlwriter - yaf - yaml - zend opcache -- zephir parser - zip - zlib +- zip - zlib ``` Read more about From cee4aa839e385d95f53dad19445ffc7162630dfc Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:40:01 +0700 Subject: [PATCH 242/311] build: add manual build for obsolete versions [skip ci][ci skip] --- .github/workflows/build_manual.yml | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build_manual.yml diff --git a/.github/workflows/build_manual.yml b/.github/workflows/build_manual.yml new file mode 100644 index 0000000..f88055e --- /dev/null +++ b/.github/workflows/build_manual.yml @@ -0,0 +1,32 @@ +name: build_manual + +on: + workflow_dispatch: + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: "Docker Pull" + run: | + docker pull adhocore/phpfpm:7.4 || true + + - name: "[7.4] Build and push" + id: docker_build_74 + uses: docker/build-push-action@v4 + with: + push: true + file: 7.4.Dockerfile + tags: adhocore/phpfpm:7.4 + platforms: linux/amd64,linux/arm64 From 2bc67cce9408e86a236b909008e6c1059ffce8af Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:46:55 +0700 Subject: [PATCH 243/311] docs: update image size/version [skip ci][ci skip] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7a2f79..1ff3c59 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ **Important Note**: To be able to support arm builds ([#81](https://github.com/adhocore/docker-phpfpm/issues/81)) we removed some big and slow to compile extensions like swoole/grpc/phalcon for now. Check [example](#extensions) below how to add them back in your images based off on `adhcore/phpfpm`. -Docker PHP FPM with lean alpine base. The download size is just about ~150MB. +Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP8.2.4, PHP8.1.17 and PHP8.0.28 with plenty of common and useful extensions. +It contains PHP>=8.2.5, PHP>=8.1.18 and PHP>=8.0.28 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. @@ -65,7 +65,7 @@ Latest versions of both Composer v1 and v2 are installed already. You can run v2 ### Extensions You can add new extensions in your image like so: -``` +```Dockerfile FROM adhocore/phpfpm:8.1 # or 8.2, 8.0 RUN \ From c4bee4565cbe9a2aaa11b93cc327cae7e15defe5 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 14:19:47 +0700 Subject: [PATCH 244/311] fix(7.4): cleanup before install [skip ci][ci skip] --- 7.4.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 4a4ff69..aa695d9 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -38,10 +38,10 @@ RUN \ # # php extensions && docker-php-source extract \ - && pecl channel-update pecl.php.net \ - && docker-pecl-ext-install $PECL_EXTENSIONS \ && cd /usr/local/lib/php/extensions/no-debug-non-zts-20190902 && rm -f intl.so mongodb.so && cd - \ && cd /usr/local/etc/php/conf.d && rm -f *-intl.ini *-mongodb.ini && cd - \ + && pecl channel-update pecl.php.net \ + && docker-pecl-ext-install $PECL_EXTENSIONS \ && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ # zephir_parser # && { php -m | grep zephir_parser || (curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \ From 731710b20eb8c934becc822caa97c148331b00a4 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 15 Apr 2023 14:36:27 +0700 Subject: [PATCH 245/311] docs: update install ext [skip ci][ci skip] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ff3c59..4e5020c 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ RUN \ && apk del $PHPIZE_DEPS \ # # if it is in php ext: \ - && docker-php-source extract && docker-php-ext-install-if dba + && docker-php-source extract && docker-php-ext-install-if dba \ + && docker-php-source delete ``` Debug extension `xdebug` is installed but disabled by default for performance reason, From d7ee79ab480abb9faf02292c2e1cc498be0cd3e9 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 25 May 2023 16:55:24 +0700 Subject: [PATCH 246/311] feat: bump 8.1 to 8.1.19 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 4ea44fa..816cf47 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.18-fpm-alpine3.16 +FROM php:8.1.19-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 203afc2098d4f586f2befe4487c709683e7f9030 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 25 May 2023 16:56:31 +0700 Subject: [PATCH 247/311] feat: bump 8.2 to 8.2.6 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 42e4390..392d0b5 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.5-fpm-alpine3.16 +FROM php:8.2.6-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 42460cff2c47aff1c9f70ca3af004b936ece5767 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 25 May 2023 18:32:51 +0700 Subject: [PATCH 248/311] feat: 8.2 alpine base --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 392d0b5..d19200b 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.6-fpm-alpine3.16 +FROM php:8.2.6-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From d4781e50c034f1ae9c27ba4a83471eea94b1330a Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Thu, 25 May 2023 18:38:40 +0700 Subject: [PATCH 249/311] feat: 8.1 alpine base --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 816cf47..2f2851a 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.19-fpm-alpine3.16 +FROM php:8.1.19-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 3a87d1ff88233e0ed39577d3c794b3617a31345b Mon Sep 17 00:00:00 2001 From: Marko Tukiainen Date: Mon, 5 Jun 2023 12:38:14 +0300 Subject: [PATCH 250/311] Updated 8.1 and 8.2 Dockerfiles to fix an issue with the intl.so module not finding its dependencies. --- 8.1.Dockerfile | 1 + 8.2.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 2f2851a..c54ce74 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -38,6 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index d19200b..46f682b 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -40,6 +40,7 @@ RUN \ # # php extensions && docker-php-source extract \ + && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ From 162f967dbd1e42d58c729a081e2ae1c704417ead Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:36:22 +0545 Subject: [PATCH 251/311] feat: bump 8.2 to 8.2.7 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 46f682b..5cbaa3e 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.6-fpm-alpine3.17 +FROM php:8.2.7-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From acd953575ca589d6ea55755286f2abe5dc5a87af Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:38:47 +0545 Subject: [PATCH 252/311] feat: bump 8.1 to 8.1.20 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index c54ce74..ab9fa60 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.19-fpm-alpine3.17 +FROM php:8.1.20-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From cf92256fa363ad8c0cdf7645c7fa572ad764f333 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:40:08 +0545 Subject: [PATCH 253/311] feat: bump 8.0 to 8.0.29 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 8b34461..bc56805 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.28-fpm-alpine3.16 +FROM php:8.0.29-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From 10e28f5059c90b5b2588fbc22cf822e98bc7b966 Mon Sep 17 00:00:00 2001 From: Jitendra <2908547+adhocore@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:22:48 +0545 Subject: [PATCH 254/311] docs: update [skip ci] --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4e5020c..508eee3 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,15 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.2.5, PHP>=8.1.18 and PHP>=8.0.28 with plenty of common and useful extensions. +It contains PHP>=8.2.7, PHP>=8.1.20 and PHP>=8.0.29 with plenty of common and useful extensions. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). -It comes prepackaged with `composer` - both v1 and v2. -Use `composer` command for v2 and `composer1` for v1. +The images are always latest, everytime a new PHP version comes out and its official image is available we will see it in adhocore/phpfpm the next day. + ## Usage @@ -84,6 +84,8 @@ RUN \ Debug extension `xdebug` is installed but disabled by default for performance reason, just run `docker-php-ext-enable xdebug` to enable it again without having to rebuild/recompile. +> `docker-php-ext-install-if` is like the inbuilt `docker-php-ext-install` but a little better, because this one installs extensions only if really needed i.e. not installed at all (so even disabled extensions need not to be installed all over again). + Below you can find list of extensions by image tags. #### PHP8.2 @@ -91,7 +93,7 @@ Below you can find list of extensions by image tags. The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` -PHP >=8.2.5, Total extensions: 82 +PHP >=8.2.7, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -120,7 +122,7 @@ PHP >=8.2.5, Total extensions: 82 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -PHP >=8.1.18, Total extensions: 83 +PHP >=8.1.20, Total extensions: 83 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -149,7 +151,7 @@ PHP >=8.1.18, Total extensions: 83 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -PHP >=8.0.28, Total extensions: 84 +PHP >=8.0.29, Total extensions: 84 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev From c469d05338ef1e208bd692a2b4a7f62062df5a4b Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sun, 2 Jul 2023 08:47:47 +0700 Subject: [PATCH 255/311] build: add manual preview build action [skip ci] --- .github/workflows/build_preview.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/build_preview.yml diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml new file mode 100644 index 0000000..bf92b2a --- /dev/null +++ b/.github/workflows/build_preview.yml @@ -0,0 +1,29 @@ +name: build_preview + +on: + workflow_dispatch: + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: "[8.3a] Build and push" + id: docker_build_83 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.3.Dockerfile + tags: adhocore/phpfpm:8.3a + platforms: linux/amd64,linux/arm64 From 54fe97f5ddf074177783764ef04820f72fb7ccf1 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sun, 2 Jul 2023 08:47:18 +0700 Subject: [PATCH 256/311] feat: add 8.3alpha Dockerfile --- 8.3.Dockerfile | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 8.3.Dockerfile diff --git a/8.3.Dockerfile b/8.3.Dockerfile new file mode 100644 index 0000000..b933a15 --- /dev/null +++ b/8.3.Dockerfile @@ -0,0 +1,59 @@ +FROM php:8.3.0alpha2-fpm-alpine3.17 + +MAINTAINER Jitendra Adhikari + +ENV \ + MAXMIND_VERSION=1.4.2 \ + SWOOLE_VERSION=4.8.9 \ + SWOOLE_ASYNC_VERSION=4.5.5 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS="apcu ast ds ev igbinary imagick lzf memcached mongodb msgpack oauth pcov \ + psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql \ + pdo_pgsql pspell shmop soap sysvshm sysvmsg sysvsem tidy xsl zip" \ + PECL_EXTENSIONS_FUTURE="grpc yaf" \ + PHP_EXTENSIONS_FUTURE="intl sockets" + +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +#COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +#COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ + # prod deps + && apk add --no-cache aspell gettext gnu-libiconv grpc \ + icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ + openldap-back-mdb tidyhtml yaml zlib \ +# +# php extensions + && docker-php-source extract \ + && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && pecl channel-update pecl.php.net \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ + && docker-pecl-ext-install $PECL_EXTENSIONS \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ + && docker-php-source delete \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From 49cbd6b15303898486351408989c86d1c397e38a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 3 Jul 2023 15:35:03 +0700 Subject: [PATCH 257/311] chore: remove imagick --- 8.3.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index b933a15..c1f883c 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -7,11 +7,11 @@ ENV \ SWOOLE_VERSION=4.8.9 \ SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ - PECL_EXTENSIONS="apcu ast ds ev igbinary imagick lzf memcached mongodb msgpack oauth pcov \ + PECL_EXTENSIONS="apcu ast ds ev igbinary lzf memcached mongodb msgpack oauth pcov \ psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql \ pdo_pgsql pspell shmop soap sysvshm sysvmsg sysvsem tidy xsl zip" \ - PECL_EXTENSIONS_FUTURE="grpc yaf" \ + PECL_EXTENSIONS_FUTURE="grpc imagick yaf" \ PHP_EXTENSIONS_FUTURE="intl sockets" # docker-* From b716bb2654f1ae245b6851578be946df0cb9337d Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:52:05 +0545 Subject: [PATCH 258/311] docs: on 8.3a [skip ci] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 508eee3..ec88974 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ Docker PHP FPM with lean alpine base. The download size is just about **~100MB** It contains PHP>=8.2.7, PHP>=8.1.20 and PHP>=8.0.29 with plenty of common and useful extensions. +If you want to tryout and experiment with preview build of PHP8.3 alpha, you can use image `adhocore/phpfpm:8.3a`. +> 8.3a has limited extensions and is not production ready yet. + You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. If you are looking for a complete local development stack then check From 1225d9c8384ee8490cc7c85c03be53ff5b25a211 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:07:45 +0700 Subject: [PATCH 259/311] docs: php8.3 exts [skip ci] --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index ec88974..08380d9 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,27 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. +### PHP8.3a + +``` +PHP 8.3.0alpha2, Total extensions: 60 +- bcmath - bz2 - calendar - core +- ctype - curl - date - dom +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - iconv - imap - intl +- json - ldap - libxml - mbstring +- mysqli - mysqlnd - openssl - pcntl +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - random - readline - reflection +- session - shmop - simplexml - soap +- sodium - spl - sqlite3 - standard +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - xdebug - xml - xmlreader +- xmlwriter - xsl - zip - zlib +``` + #### PHP8.2 The following PHP extensions are installed in `adhocore/phpfpm:8.2`: From 0e590ee1841fd63fe16949dfaaccf46b5c99d2e0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 8 Jul 2023 21:52:45 +0700 Subject: [PATCH 260/311] feat: bump 8.2 to 8.2.8 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 5cbaa3e..8d5d74a 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.7-fpm-alpine3.17 +FROM php:8.2.8-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 146681f2a9156820136faed4ff79fc285452e02e Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 8 Jul 2023 21:53:48 +0700 Subject: [PATCH 261/311] feat: bump 8.1 to 8.1.21 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index ab9fa60..1631bf5 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.20-fpm-alpine3.17 +FROM php:8.1.21-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From c62f74365d5e633a7c7f85c058fb3e5391d1c0a3 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 11 Jul 2023 08:57:37 +0545 Subject: [PATCH 262/311] feat: bump 8.3 alpha [skip ci] --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index c1f883c..2dcf386 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0alpha2-fpm-alpine3.17 +FROM php:8.3.0alpha3-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 7c28c031471e0459140fff808b42b449e92fe1ac Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 22 Jul 2023 08:14:09 +0545 Subject: [PATCH 263/311] feat: bump 8.3 to 8.3.0b1 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 2dcf386..c994fec 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0alpha3-fpm-alpine3.17 +FROM php:8.3.0beta1-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 8720eb4ab9b23691d9531aafb6f8e75a2c1e671a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 22 Jul 2023 08:15:31 +0545 Subject: [PATCH 264/311] chore: update pipeline to use 8.3b --- .github/workflows/build_preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index bf92b2a..80b5e25 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -19,11 +19,11 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: "[8.3a] Build and push" + - name: "[8.3b] Build and push" id: docker_build_83 uses: docker/build-push-action@v4 with: push: true file: 8.3.Dockerfile - tags: adhocore/phpfpm:8.3a + tags: adhocore/phpfpm:8.3b platforms: linux/amd64,linux/arm64 From ee6261ac9bffe76586d3ea7b554b0f583f0560d5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 22 Jul 2023 08:36:41 +0545 Subject: [PATCH 265/311] docs: on 8.3b [skip ci] --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 08380d9..5eaf36d 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.2.7, PHP>=8.1.20 and PHP>=8.0.29 with plenty of common and useful extensions. +It contains PHP>=8.2.8, PHP>=8.1.21 and PHP>=8.0.29 with plenty of common and useful extensions. -If you want to tryout and experiment with preview build of PHP8.3 alpha, you can use image `adhocore/phpfpm:8.3a`. -> 8.3a has limited extensions and is not production ready yet. +If you want to tryout and experiment with preview build of PHP8.3 beta, you can use image `adhocore/phpfpm:8.3b`. +> 8.3b has limited extensions and is not production ready yet. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. @@ -38,7 +38,7 @@ docker pull adhocore/phpfpm:8.1 # or for php 8.0 docker pull adhocore/phpfpm:8.0 -# or for php 7.4 +# or for php 7.4 (end of life) docker pull adhocore/phpfpm:7.4 ``` @@ -91,7 +91,7 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. -### PHP8.3a +### PHP8.3b ``` PHP 8.3.0alpha2, Total extensions: 60 From b77f1cbd4cb2002cfa2dbe9cc3f4400cf5838022 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:27:28 +0700 Subject: [PATCH 266/311] Update 8.2.Dockerfile 8.2.9 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 8d5d74a..cb1f703 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.8-fpm-alpine3.17 +FROM php:8.2.9-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From f6d9c4a3da4da38b2cba83b211680dba0bc920a2 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:28:52 +0700 Subject: [PATCH 267/311] Update 8.1.Dockerfile 8.1.22 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 1631bf5..f7be74e 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.21-fpm-alpine3.17 +FROM php:8.1.22-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From c9159161c39af5e6d07e1c3ec06c1d9abff939b7 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:29:21 +0700 Subject: [PATCH 268/311] Update 8.0.Dockerfile 8.0.30 --- 8.0.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index bc56805..32f8454 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.29-fpm-alpine3.16 +FROM php:8.0.30-fpm-alpine3.16 MAINTAINER Jitendra Adhikari From cfc3088d31136db7f28bc494c34691f70f872990 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:32:46 +0700 Subject: [PATCH 269/311] Update 8.3.Dockerfile beta2 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index c994fec..dd042f0 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0beta1-fpm-alpine3.17 +FROM php:8.3.0beta2-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 9a5bb7305d2022938ed0fafc09a7c6880e7c9a85 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:52:58 +0700 Subject: [PATCH 270/311] feat: bump 8.2 to 8.2.10 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index cb1f703..9b5a765 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.9-fpm-alpine3.17 +FROM php:8.2.10-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From d0caef5df84aafb8e6a67c755913a0c67b355276 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:53:42 +0700 Subject: [PATCH 271/311] feat: bump 8.1 to 8.1.23 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index f7be74e..5e8dd76 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.22-fpm-alpine3.17 +FROM php:8.1.23-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From b6ab0f60078af75dc08c433534feb18b6a7a89c6 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:24:13 +0700 Subject: [PATCH 272/311] feat: bump 8.1 to 8.1.24, 8.2 to 8.2.11, 8.3 to 8.3.rc4 --- 8.1.Dockerfile | 2 +- 8.2.Dockerfile | 2 +- 8.3.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 5e8dd76..73d315d 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.23-fpm-alpine3.17 +FROM php:8.1.24-fpm-alpine3.17 MAINTAINER Jitendra Adhikari diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 9b5a765..40b78ba 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.10-fpm-alpine3.17 +FROM php:8.2.11-fpm-alpine3.17 MAINTAINER Jitendra Adhikari diff --git a/8.3.Dockerfile b/8.3.Dockerfile index dd042f0..c32b708 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0beta2-fpm-alpine3.17 +FROM php:8.3.0RC4-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 56a41959452dd03c90f86ae71c5f913dd33ab142 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:26:32 +0700 Subject: [PATCH 273/311] build: update preview build of 8.3rc --- .github/workflows/build_preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index 80b5e25..c6a08a9 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -19,11 +19,11 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: "[8.3b] Build and push" + - name: "[8.3r] Build and push" id: docker_build_83 uses: docker/build-push-action@v4 with: push: true file: 8.3.Dockerfile - tags: adhocore/phpfpm:8.3b + tags: adhocore/phpfpm:8.3r,adhocore/phpfpm:8.3rc platforms: linux/amd64,linux/arm64 From 27355476eeeb64e86efb8590c271de130dc1be55 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:29:31 +0700 Subject: [PATCH 274/311] docs: update stuffs --- README.md | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 5eaf36d..47b22d2 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.2.8, PHP>=8.1.21 and PHP>=8.0.29 with plenty of common and useful extensions. +It contains PHP>=8.2.11, PHP>=8.1.24 and PHP>=8.0.29 with plenty of common and useful extensions. -If you want to tryout and experiment with preview build of PHP8.3 beta, you can use image `adhocore/phpfpm:8.3b`. -> 8.3b has limited extensions and is not production ready yet. +If you want to tryout and experiment with preview build of PHP8.3 rc, you can use image `adhocore/phpfpm:8.3r`. +> 8.3r has limited extensions and is not production ready yet. You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. @@ -30,15 +30,19 @@ The images are always latest, everytime a new PHP version comes out and its offi To pull latest image: ```sh +# for php >=8.2.11 docker pull adhocore/phpfpm:8.2 -# or for 8.1 +# or for php >=8.1.24 docker pull adhocore/phpfpm:8.1 -# or for php 8.0 +# or for php >=8.0.30 docker pull adhocore/phpfpm:8.0 -# or for php 7.4 (end of life) +# or for php >=8.3rc4 (release candidate) +docker pull adhocore/phpfpm:8.3r + +# or for php >=7.4 (end of life) docker pull adhocore/phpfpm:7.4 ``` @@ -95,21 +99,21 @@ Below you can find list of extensions by image tags. ``` PHP 8.3.0alpha2, Total extensions: 60 -- bcmath - bz2 - calendar - core -- ctype - curl - date - dom -- exif - fileinfo - filter - fpm -- ftp - gd - gettext - gmp -- hash - iconv - imap - intl -- json - ldap - libxml - mbstring -- mysqli - mysqlnd - openssl - pcntl -- pcre - pdo - pdo_mysql - pdo_pgsql -- pdo_sqlite - pgsql - phar - posix -- pspell - random - readline - reflection -- session - shmop - simplexml - soap -- sodium - spl - sqlite3 - standard -- sysvmsg - sysvsem - sysvshm - tidy -- tokenizer - xdebug - xml - xmlreader -- xmlwriter - xsl - zip - zlib +- bcmath - bz2 - calendar - core +- ctype - curl - date - dom +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - iconv - imap - intl +- json - ldap - libxml - mbstring +- mysqli - mysqlnd - openssl - pcntl +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - random - readline - reflection +- session - shmop - simplexml - soap +- sodium - spl - sqlite3 - standard +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - xdebug - xml - xmlreader +- xmlwriter - xsl - zip - zlib ``` #### PHP8.2 From 0b4459b034fa9a61cfc024b36fbc7e181166a1d1 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:54:58 +0545 Subject: [PATCH 275/311] feat: bump 8.3 to 8.3.0.rc5 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index c32b708..2e66f51 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0RC4-fpm-alpine3.17 +FROM php:8.3.0RC5-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 4b34a818ad23d9664257d92c86eb32a18f64a9f2 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:55:40 +0545 Subject: [PATCH 276/311] feat: bump 8.2 to 8.2.12 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 40b78ba..5d7911a 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.11-fpm-alpine3.17 +FROM php:8.2.12-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 68abe419fcf9b73d2db4b38ac938cbeaf8aecb52 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:56:31 +0545 Subject: [PATCH 277/311] feat: bump 8.1 to 8.3.1.25 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 73d315d..052b692 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.24-fpm-alpine3.17 +FROM php:8.1.25-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 473254c2a43c4a34da6d1f18c20e288d8abd27b5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:00:13 +0545 Subject: [PATCH 278/311] docs: bump versions --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 47b22d2..678f3bc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.2.11, PHP>=8.1.24 and PHP>=8.0.29 with plenty of common and useful extensions. +It contains PHP>=8.2.12, PHP>=8.1.25 and PHP>=8.0.30 with plenty of common and useful extensions. If you want to tryout and experiment with preview build of PHP8.3 rc, you can use image `adhocore/phpfpm:8.3r`. > 8.3r has limited extensions and is not production ready yet. @@ -30,16 +30,16 @@ The images are always latest, everytime a new PHP version comes out and its offi To pull latest image: ```sh -# for php >=8.2.11 +# for php >=8.2.12 docker pull adhocore/phpfpm:8.2 -# or for php >=8.1.24 +# or for php >=8.1.25 docker pull adhocore/phpfpm:8.1 # or for php >=8.0.30 docker pull adhocore/phpfpm:8.0 -# or for php >=8.3rc4 (release candidate) +# or for php >=8.3rc5 (release candidate) docker pull adhocore/phpfpm:8.3r # or for php >=7.4 (end of life) @@ -95,10 +95,10 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. -### PHP8.3b +### PHP8.3r ``` -PHP 8.3.0alpha2, Total extensions: 60 +PHP 8.3.0rc5, Total extensions: 60 - bcmath - bz2 - calendar - core - ctype - curl - date - dom - exif - fileinfo - filter - fpm @@ -121,7 +121,7 @@ PHP 8.3.0alpha2, Total extensions: 60 The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` -PHP >=8.2.7, Total extensions: 82 +PHP >=8.2.12, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -150,7 +150,7 @@ PHP >=8.2.7, Total extensions: 82 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -PHP >=8.1.20, Total extensions: 83 +PHP >=8.1.25, Total extensions: 83 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -179,7 +179,7 @@ PHP >=8.1.20, Total extensions: 83 The following PHP extensions are installed in `adhocore/phpfpm:8.0`: ``` -PHP >=8.0.29, Total extensions: 84 +PHP >=8.0.30, Total extensions: 84 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev From aeb9fe60f393685757a2098cac7a10c29c0fcd24 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 25 Nov 2023 22:41:04 +0700 Subject: [PATCH 279/311] feat(8.1): bump 8.1 to 8.1.26 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 052b692..c83ce8b 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.25-fpm-alpine3.17 +FROM php:8.1.26-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From c5a168c0a72e9b5569e57a6526480d9852327af9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sun, 26 Nov 2023 12:38:41 +0700 Subject: [PATCH 280/311] feat(8.2): bump 8.2 to 8.2.13 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 5d7911a..cb7433f 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.12-fpm-alpine3.17 +FROM php:8.2.13-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 1ccd5ef670562f609cdb45fab0915718b2e97a76 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:07:00 +0700 Subject: [PATCH 281/311] chore: 8.3 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 2e66f51..fc4f548 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0RC5-fpm-alpine3.17 +FROM php:8.3-fpm-alpine3.17 MAINTAINER Jitendra Adhikari From 27861d8119a738df48a5f4dcfe766fc8011d4479 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:10:30 +0700 Subject: [PATCH 282/311] build: 8.3 --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2095f04..14ef315 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,3 +53,12 @@ jobs: file: 8.0.Dockerfile tags: adhocore/phpfpm:8.0 platforms: linux/amd64,linux/arm64 + + - name: "[8.3] Build and push" + id: docker_build_83 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.3.Dockerfile + tags: adhocore/phpfpm:8.3 + platforms: linux/amd64,linux/arm64 From c8a243513adbc3e4c612f4a204541ad6b67b66b0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:11:22 +0700 Subject: [PATCH 283/311] feat: 8.3.4 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index fc4f548..3d914eb 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-fpm-alpine3.17 +FROM php:8.3.4-fpm-alpine3.18 MAINTAINER Jitendra Adhikari From 9d097fd549f4a2a31058de7c4d10eb508b52a4a3 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Fri, 22 Mar 2024 16:36:19 +0700 Subject: [PATCH 284/311] feat(8.3): use cache, tag latest, build first --- .github/workflows/build.yml | 20 +++++++++++--------- 8.3.Dockerfile | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14ef315..5685680 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,16 @@ jobs: docker pull adhocore/phpfpm:8.0 || true docker pull adhocore/phpfpm:8.1 || true docker pull adhocore/phpfpm:8.2 || true + docker pull adhocore/phpfpm:8.3 || true + + - name: "[8.3] Build and push" + id: docker_build_83 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.3.Dockerfile + tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest + platforms: linux/amd64,linux/arm64 - name: "[8.2] Build and push" id: docker_build_82 @@ -33,7 +43,7 @@ jobs: with: push: true file: 8.2.Dockerfile - tags: adhocore/phpfpm:8.2,adhocore/phpfpm:latest + tags: adhocore/phpfpm:8.2 platforms: linux/amd64,linux/arm64 - name: "[8.1] Build and push" @@ -54,11 +64,3 @@ jobs: tags: adhocore/phpfpm:8.0 platforms: linux/amd64,linux/arm64 - - name: "[8.3] Build and push" - id: docker_build_83 - uses: docker/build-push-action@v4 - with: - push: true - file: 8.3.Dockerfile - tags: adhocore/phpfpm:8.3 - platforms: linux/amd64,linux/arm64 diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 3d914eb..7e158b1 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -#COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ +COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From cbef1b04b3c575a3b10de971954947180b631af8 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:37:43 +0700 Subject: [PATCH 285/311] docs: versions [skip ci][ci skip] --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 678f3bc..16f24da 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.2.12, PHP>=8.1.25 and PHP>=8.0.30 with plenty of common and useful extensions. +It contains PHP>=8.3.4, PHP>=8.2.13, PHP>=8.1.26 and PHP>=8.0.30 with plenty of common and useful extensions. If you want to tryout and experiment with preview build of PHP8.3 rc, you can use image `adhocore/phpfpm:8.3r`. > 8.3r has limited extensions and is not production ready yet. @@ -30,6 +30,9 @@ The images are always latest, everytime a new PHP version comes out and its offi To pull latest image: ```sh +# for php >=8.3.4 +docker pull adhocore/phpfpm:8.3 + # for php >=8.2.12 docker pull adhocore/phpfpm:8.2 @@ -95,10 +98,10 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. -### PHP8.3r +### PHP8.3 ``` -PHP 8.3.0rc5, Total extensions: 60 +PHP 8.3.4, Total extensions: 60 - bcmath - bz2 - calendar - core - ctype - curl - date - dom - exif - fileinfo - filter - fpm From 0f798bf81c7319e92e5bcc7292d519bde8c55352 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:39:29 +0700 Subject: [PATCH 286/311] feat(8.1): bump to 8.1.27 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index c83ce8b..57bfa7d 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.26-fpm-alpine3.17 +FROM php:8.1.27-fpm-alpine3.18 MAINTAINER Jitendra Adhikari From c0a54cd594c49f9455b121cbdcf16e562aabdf10 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:41:06 +0700 Subject: [PATCH 287/311] feat(8.2): bump to 8.2.17 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index cb7433f..2086f73 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.13-fpm-alpine3.17 +FROM php:8.2.17-fpm-alpine3.18 MAINTAINER Jitendra Adhikari From b6843b7e29660d1ddf21ad095e7344c68ba9113f Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:45:33 +0700 Subject: [PATCH 288/311] docs: versions --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 16f24da..f4a698e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.3.4, PHP>=8.2.13, PHP>=8.1.26 and PHP>=8.0.30 with plenty of common and useful extensions. +It contains PHP>=8.3.4, PHP>=8.2.17, PHP>=8.1.27 and PHP>=8.0.30 with plenty of common and useful extensions. If you want to tryout and experiment with preview build of PHP8.3 rc, you can use image `adhocore/phpfpm:8.3r`. > 8.3r has limited extensions and is not production ready yet. @@ -33,10 +33,10 @@ To pull latest image: # for php >=8.3.4 docker pull adhocore/phpfpm:8.3 -# for php >=8.2.12 +# for php >=8.2.17 docker pull adhocore/phpfpm:8.2 -# or for php >=8.1.25 +# or for php >=8.1.27 docker pull adhocore/phpfpm:8.1 # or for php >=8.0.30 @@ -56,7 +56,7 @@ version: '3' services: phpfpm: - image: adhocore/phpfpm:8.0 + image: adhocore/phpfpm:8.3 container_name: phpfpm volumes: - ./path/to/your/app:/var/www/html @@ -76,7 +76,7 @@ Latest versions of both Composer v1 and v2 are installed already. You can run v2 You can add new extensions in your image like so: ```Dockerfile -FROM adhocore/phpfpm:8.1 # or 8.2, 8.0 +FROM adhocore/phpfpm:8.3 # or 8.2, 8.1 RUN \ # setup @@ -124,7 +124,7 @@ PHP 8.3.4, Total extensions: 60 The following PHP extensions are installed in `adhocore/phpfpm:8.2`: ``` -PHP >=8.2.12, Total extensions: 82 +PHP >=8.2.17, Total extensions: 82 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev @@ -153,7 +153,7 @@ PHP >=8.2.12, Total extensions: 82 The following PHP extensions are installed in `adhocore/phpfpm:8.1`: ``` -PHP >=8.1.25, Total extensions: 83 +PHP >=8.1.27, Total extensions: 83 - apcu - ast - bcmath - bz2 - calendar - core - ctype - curl - date - dom - ds - ev From fc88eb47d16398b183d0d5b9cb2ad79380fac63f Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:54:27 +0700 Subject: [PATCH 289/311] feat: add ext-remove, maybe fix apcu --- 8.2.Dockerfile | 2 +- docker-php-ext-disable | 4 ++-- docker-php-ext-remove | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100755 docker-php-ext-remove diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 2086f73..aff8061 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -40,7 +40,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && docker-php-ext-remove apcu intl mognodb \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/docker-php-ext-disable b/docker-php-ext-disable index ad2a56e..e3afa13 100755 --- a/docker-php-ext-disable +++ b/docker-php-ext-disable @@ -3,7 +3,7 @@ set -e extDir=$(php -r 'echo ini_get("extension_dir");') -iniDir=$PHP_INI_DIR/conf.d/ +iniDir=$PHP_INI_DIR/conf.d usage() { echo "usage: $0 [options] module-name [module-name ...]" @@ -31,6 +31,6 @@ for module; do done [[ -n "$modules" ]] \ - && rmIni=$(grep -lE "$modules" $PHP_INI_DIR/conf.d/*.ini) \ + && rmIni=$(grep -lE "$modules" $iniDir/*.ini) \ && echo "$rmIni" \ | xargs rm diff --git a/docker-php-ext-remove b/docker-php-ext-remove new file mode 100755 index 0000000..6cc691f --- /dev/null +++ b/docker-php-ext-remove @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +extDir=$(php -r 'echo ini_get("extension_dir");') + +[[ "" = "$@" ]] && exit 0 + +docker-php-ext-disable $@ + +for module; do + rm -rf $extDir/$module $extDir/$module.so +done From c610c36e33934386879d69a6008f585d952ec983 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:55:11 +0700 Subject: [PATCH 290/311] build: temp disable 8.3 --- .github/workflows/build.yml | 16 ++++++++-------- docker-php-ext-remove | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5685680..b27ba3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,14 +28,14 @@ jobs: docker pull adhocore/phpfpm:8.2 || true docker pull adhocore/phpfpm:8.3 || true - - name: "[8.3] Build and push" - id: docker_build_83 - uses: docker/build-push-action@v4 - with: - push: true - file: 8.3.Dockerfile - tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest - platforms: linux/amd64,linux/arm64 + # - name: "[8.3] Build and push" + # id: docker_build_83 + # uses: docker/build-push-action@v4 + # with: + # push: true + # file: 8.3.Dockerfile + # tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest + # platforms: linux/amd64,linux/arm64 - name: "[8.2] Build and push" id: docker_build_82 diff --git a/docker-php-ext-remove b/docker-php-ext-remove index 6cc691f..2e9cb14 100755 --- a/docker-php-ext-remove +++ b/docker-php-ext-remove @@ -4,10 +4,10 @@ set -e extDir=$(php -r 'echo ini_get("extension_dir");') -[[ "" = "$@" ]] && exit 0 - -docker-php-ext-disable $@ +modules=$@ +[[ "" = "$modules" ]] && exit 0 +docker-php-ext-disable $modules for module; do rm -rf $extDir/$module $extDir/$module.so done From 2864e19e55c889888422c1d3b2a8f29ba6aebc37 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:45:02 +0700 Subject: [PATCH 291/311] fix: 8.2 --- 8.2.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index aff8061..46c4adf 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +# COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +# COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -40,7 +40,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && docker-php-ext-remove apcu intl mognodb \ + && echo docker-php-ext-remove apcu intl mognodb imagick \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ From 97d6507c1a3a6c2ce9939914517f253c20b07d2b Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sun, 31 Mar 2024 11:52:19 +0700 Subject: [PATCH 292/311] fix: 8.1 --- .github/workflows/build.yml | 16 ++++++++-------- 8.0.Dockerfile | 3 --- 8.1.Dockerfile | 11 ++++------- 8.2.Dockerfile | 9 +++------ 8.3.Dockerfile | 3 --- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b27ba3a..ffd6577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,14 +37,14 @@ jobs: # tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest # platforms: linux/amd64,linux/arm64 - - name: "[8.2] Build and push" - id: docker_build_82 - uses: docker/build-push-action@v4 - with: - push: true - file: 8.2.Dockerfile - tags: adhocore/phpfpm:8.2 - platforms: linux/amd64,linux/arm64 + # - name: "[8.2] Build and push" + # id: docker_build_82 + # uses: docker/build-push-action@v4 + # with: + # push: true + # file: 8.2.Dockerfile + # tags: adhocore/phpfpm:8.2 + # platforms: linux/amd64,linux/arm64 - name: "[8.1] Build and push" id: docker_build_81 diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 32f8454..4b81aa4 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -3,9 +3,6 @@ FROM php:8.0.30-fpm-alpine3.16 MAINTAINER Jitendra Adhikari ENV \ - MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.6.7 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="ev imagick ssh2-1.3.1 xlswriter yaf" \ PECL_EXTENSIONS="apcu ast ds igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaml" \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 57bfa7d..ff2ddd4 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -3,9 +3,6 @@ FROM php:8.1.27-fpm-alpine3.18 MAINTAINER Jitendra Adhikari ENV \ - MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.8.9 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS_FUTURE="imagick ssh2-1.3.1 xlswriter" \ PECL_EXTENSIONS="apcu ast ds ev igbinary lzf memcached mongodb msgpack oauth pcov psr redis rdkafka simdjson uuid xdebug xhprof yaf yaml" \ @@ -16,8 +13,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +# COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +# COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -37,8 +34,8 @@ RUN \ openldap-back-mdb tidyhtml yaml zlib \ # # php extensions - && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && echo 'php-extensions' && docker-php-source extract \ + && docker-php-ext-remove intl || true \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 46c4adf..6ca11c2 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -3,9 +3,6 @@ FROM php:8.2.17-fpm-alpine3.18 MAINTAINER Jitendra Adhikari ENV \ - MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.8.9 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev igbinary imagick lzf memcached mongodb msgpack oauth pcov \ psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ @@ -18,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -# COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -# COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -40,7 +37,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && echo docker-php-ext-remove apcu intl mognodb imagick \ + && docker-php-ext-remove intl \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 7e158b1..49a93fa 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -3,9 +3,6 @@ FROM php:8.3.4-fpm-alpine3.18 MAINTAINER Jitendra Adhikari ENV \ - MAXMIND_VERSION=1.4.2 \ - SWOOLE_VERSION=4.8.9 \ - SWOOLE_ASYNC_VERSION=4.5.5 \ LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ PECL_EXTENSIONS="apcu ast ds ev igbinary lzf memcached mongodb msgpack oauth pcov \ psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ From 57863b54f8d310d4bb1eb656bd64b6a785fe4950 Mon Sep 17 00:00:00 2001 From: Jitendra A <2908547+adhocore@users.noreply.github.com> Date: Sun, 31 Mar 2024 14:07:10 +0700 Subject: [PATCH 293/311] chore: restore --- .github/workflows/build.yml | 32 ++++++++++++++++---------------- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 6 +++--- 8.2.Dockerfile | 2 +- 8.3.Dockerfile | 2 +- docker-pecl-ext-install | 2 +- docker-php-ext-remove | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffd6577..5685680 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,23 +28,23 @@ jobs: docker pull adhocore/phpfpm:8.2 || true docker pull adhocore/phpfpm:8.3 || true - # - name: "[8.3] Build and push" - # id: docker_build_83 - # uses: docker/build-push-action@v4 - # with: - # push: true - # file: 8.3.Dockerfile - # tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest - # platforms: linux/amd64,linux/arm64 + - name: "[8.3] Build and push" + id: docker_build_83 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.3.Dockerfile + tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest + platforms: linux/amd64,linux/arm64 - # - name: "[8.2] Build and push" - # id: docker_build_82 - # uses: docker/build-push-action@v4 - # with: - # push: true - # file: 8.2.Dockerfile - # tags: adhocore/phpfpm:8.2 - # platforms: linux/amd64,linux/arm64 + - name: "[8.2] Build and push" + id: docker_build_82 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.2.Dockerfile + tags: adhocore/phpfpm:8.2 + platforms: linux/amd64,linux/arm64 - name: "[8.1] Build and push" id: docker_build_81 diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 4b81aa4..aaaa950 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -35,7 +35,7 @@ RUN \ # # php extensions && docker-php-source extract \ -# && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20200930/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && docker-php-ext-remove intl || true \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index ff2ddd4..42298fb 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -13,8 +13,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -# COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -# COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -34,7 +34,7 @@ RUN \ openldap-back-mdb tidyhtml yaml zlib \ # # php extensions - && echo 'php-extensions' && docker-php-source extract \ + && docker-php-source extract \ && docker-php-ext-remove intl || true \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 6ca11c2..f04b7ab 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -37,7 +37,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && docker-php-ext-remove intl \ + && docker-php-ext-remove intl || true \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 49a93fa..23ae218 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -37,7 +37,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && docker-php-ext-remove intl || true \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/docker-pecl-ext-install b/docker-pecl-ext-install index 0e88bc8..7d6a78e 100755 --- a/docker-pecl-ext-install +++ b/docker-pecl-ext-install @@ -16,7 +16,7 @@ usage() { modules= for module; do [[ "$module" == "--help" ]] || [[ "$module" == "-h" ]] && usage >&2 - [[ -n "$modules" ]] && modules="$modules $module" || modules="$module" + [[ -n "$modules" ]] && modules="$modules $module" || modules="$module" || true done [[ "" = "$modules" ]] && exit 0 diff --git a/docker-php-ext-remove b/docker-php-ext-remove index 2e9cb14..151b0ab 100755 --- a/docker-php-ext-remove +++ b/docker-php-ext-remove @@ -7,7 +7,7 @@ extDir=$(php -r 'echo ini_get("extension_dir");') modules=$@ [[ "" = "$modules" ]] && exit 0 -docker-php-ext-disable $modules +docker-php-ext-disable $modules || true for module; do - rm -rf $extDir/$module $extDir/$module.so + rm -rf $extDir/$module $extDir/$module.so || true done From e373b4184a833320ad10e05b81e209537fabed81 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Thu, 4 Apr 2024 10:47:40 +0700 Subject: [PATCH 294/311] docs: [skip ci][ci skip] --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index f4a698e..3c5b9fb 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,6 @@ Docker PHP FPM with lean alpine base. The download size is just about **~100MB** It contains PHP>=8.3.4, PHP>=8.2.17, PHP>=8.1.27 and PHP>=8.0.30 with plenty of common and useful extensions. -If you want to tryout and experiment with preview build of PHP8.3 rc, you can use image `adhocore/phpfpm:8.3r`. -> 8.3r has limited extensions and is not production ready yet. - -You can also continue using [`adhocore/phpfpm:7.4`](./7.4.Dockerfile) for PHP7.4.33 but this version is now deprecated. - If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). From d93e63d5b85182a4f25ee2c66c31763f8254fd3b Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Thu, 2 May 2024 14:25:28 +0700 Subject: [PATCH 295/311] docs: maintainer [skip ci][ci skip] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c5b9fb..209d31c 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ If you are looking for a complete local development stack then check The images are always latest, everytime a new PHP version comes out and its official image is available we will see it in adhocore/phpfpm the next day. +> This repo is looking for maintainer (start a thread in [#101](https://github.com/adhocore/docker-phpfpm/issues/101) if interested) ## Usage From 1d262bb700b19d84a4e963ef835467f2d2d1fe78 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:14:29 +0700 Subject: [PATCH 296/311] feat: bump 8.1 to 8.1.29 --- 8.1.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 42298fb..b0d773e 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.27-fpm-alpine3.18 +FROM php:8.1.29-fpm-alpine3.20 MAINTAINER Jitendra Adhikari @@ -13,8 +13,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +#COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From 952180435b738b9d100b3916c9a0d86fe006f845 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:19:13 +0700 Subject: [PATCH 297/311] feat: bump 8.3 to 8.3.11 --- 8.3.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 23ae218..292d814 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.4-fpm-alpine3.18 +FROM php:8.3.11-fpm-alpine3.20 MAINTAINER Jitendra Adhikari @@ -15,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ -COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ +#COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From ab228fef76f4be24c61c449c7e2c14224869eff0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:23:14 +0700 Subject: [PATCH 298/311] feat: bump 8.2 to 8.2.23 --- 8.2.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index f04b7ab..04c64fc 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.17-fpm-alpine3.18 +FROM php:8.2.23-fpm-alpine3.20 MAINTAINER Jitendra Adhikari @@ -15,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From fef8938aa052957ddcd1fdb8c988d2b9980c7ad0 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:05:14 +0700 Subject: [PATCH 299/311] chore: restore cache (8.3) --- 8.3.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 292d814..f72f3ea 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -15,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ -#COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.3 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ +COPY --from=adhocore/phpfpm:8.3 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From fc3f9b8fe33f5011a6c4409468e49d5d172e7814 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Tue, 10 Sep 2024 07:36:16 +0700 Subject: [PATCH 300/311] chore: restore cache (8.1) --- 8.1.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index b0d773e..4294030 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -13,8 +13,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -#COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From 2665f98044704d4763e9253b12cec8cbf65bf5a5 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Fri, 13 Sep 2024 22:34:15 +0700 Subject: [PATCH 301/311] chore: restore cache (8.2) --- 8.2.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 04c64fc..1656cb5 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -15,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -#COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -#COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From 620eeaa4d06bc3b09987bfc492ae981de45c201c Mon Sep 17 00:00:00 2001 From: Dung Nguyen Date: Fri, 6 Dec 2024 00:05:46 +0700 Subject: [PATCH 302/311] fix: GD Error loading shared library libjpeg.so.8 --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 8.2.Dockerfile | 2 +- 8.3.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index aa695d9..0dc1fe0 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -33,7 +33,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libjpeg libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ # # php extensions diff --git a/8.0.Dockerfile b/8.0.Dockerfile index aaaa950..d624abc 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -29,7 +29,7 @@ RUN \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc \ - icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \ + icu imagemagick libjpeg imap-dev libzip libbz2 libxml2-utils libpq \ libmemcached libssh2 libevent libev librdkafka libxslt \ linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ # diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 4294030..72fd1f4 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -29,7 +29,7 @@ RUN \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc \ - icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ # diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 1656cb5..658608c 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -31,7 +31,7 @@ RUN \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc \ - icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ # diff --git a/8.3.Dockerfile b/8.3.Dockerfile index f72f3ea..56edcf1 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -31,7 +31,7 @@ RUN \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps && apk add --no-cache aspell gettext gnu-libiconv grpc \ - icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ # From da207bcf053516ebb280f4f0f1a299c4466a252d Mon Sep 17 00:00:00 2001 From: Dung Nguyen Date: Sat, 7 Dec 2024 00:18:04 +0700 Subject: [PATCH 303/311] fix: gmp error loading shared library libgmp.so.10 --- 7.4.Dockerfile | 2 +- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 8.2.Dockerfile | 2 +- 8.3.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/7.4.Dockerfile b/7.4.Dockerfile index 0dc1fe0..4376806 100644 --- a/7.4.Dockerfile +++ b/7.4.Dockerfile @@ -33,7 +33,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libjpeg libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ + && apk add --no-cache icu gettext gmp gnu-libiconv grpc imagemagick libjpeg libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \ libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \ # # php extensions diff --git a/8.0.Dockerfile b/8.0.Dockerfile index d624abc..9c71b41 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -28,7 +28,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc \ + && apk add --no-cache aspell gettext gmp gnu-libiconv grpc \ icu imagemagick libjpeg imap-dev libzip libbz2 libxml2-utils libpq \ libmemcached libssh2 libevent libev librdkafka libxslt \ linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 72fd1f4..4f52ce6 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -28,7 +28,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc \ + && apk add --no-cache aspell gettext gmp gnu-libiconv grpc \ icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 658608c..4aa61d4 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -30,7 +30,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc \ + && apk add --no-cache aspell gettext gmp gnu-libiconv grpc \ icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 56edcf1..2048e17 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -30,7 +30,7 @@ RUN \ libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ # prod deps - && apk add --no-cache aspell gettext gnu-libiconv grpc \ + && apk add --no-cache aspell gettext gmp gnu-libiconv grpc \ icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ openldap-back-mdb tidyhtml yaml zlib \ From 091e7a07a10346127113156f82a555e8439f0994 Mon Sep 17 00:00:00 2001 From: Luis Gonzalez Date: Fri, 6 Dec 2024 11:35:07 -0600 Subject: [PATCH 304/311] Adding new Dockerfile --- 8.4.Dockerfile | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 8.4.Dockerfile diff --git a/8.4.Dockerfile b/8.4.Dockerfile new file mode 100644 index 0000000..a512eea --- /dev/null +++ b/8.4.Dockerfile @@ -0,0 +1,56 @@ +FROM php:8.4.1-fpm-alpine3.20 + +MAINTAINER Jitendra Adhikari + +ENV \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so \ + PECL_EXTENSIONS="apcu ast ds ev igbinary lzf memcached mongodb msgpack oauth pcov \ + psr redis rdkafka simdjson ssh2-1.3.1 uuid xdebug xhprof xlswriter yaml" \ + PHP_EXTENSIONS="bcmath bz2 calendar exif gd gettext gmp imap intl ldap mysqli pcntl pdo_mysql pgsql \ + pdo_pgsql pspell shmop soap sysvshm sysvmsg sysvsem tidy xsl zip" \ + PECL_EXTENSIONS_FUTURE="grpc imagick yaf" \ + PHP_EXTENSIONS_FUTURE="intl sockets" + +# docker-* +COPY docker-* /usr/local/bin/ + +# copy from existing +COPY --from=adhocore/phpfpm:8.4 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ +COPY --from=adhocore/phpfpm:8.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ + +# ext +COPY ext.php /ext.php + +RUN \ +# deps + apk add -U --no-cache --virtual temp \ + # dev deps + autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \ + icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \ + libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \ + freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \ + # prod deps + && apk add --no-cache aspell gettext gnu-libiconv grpc \ + icu imagemagick libjpeg imap-dev libzip libbz2 librdkafka libxml2-utils libpq \ + libmemcached libssh2 libevent libev libxslt linux-headers lua openldap \ + openldap-back-mdb tidyhtml yaml zlib \ +# +# php extensions + && docker-php-source extract \ + && docker-php-ext-remove intl || true \ + && pecl channel-update pecl.php.net \ + && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ + && docker-php-ext-install-if $PHP_EXTENSIONS \ + && docker-pecl-ext-install $PECL_EXTENSIONS \ + && { docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache > /dev/null || true; } \ + && { php -m | grep xdebug && docker-php-ext-disable xdebug || true; } \ + && docker-php-source delete \ +# +# composer + && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && curl -sSL https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \ +# +# cleanup + && apk del temp \ + && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/* \ + && php -f /ext.php From 6e6e9342b2955aaab6062087dd9bdb20b5efab95 Mon Sep 17 00:00:00 2001 From: Luis Gonzalez Date: Fri, 6 Dec 2024 11:37:47 -0600 Subject: [PATCH 305/311] Updating github actions config --- .github/workflows/build.yml | 10 ++++++++++ .github/workflows/build_preview.yml | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5685680..8a4fd8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,16 @@ jobs: docker pull adhocore/phpfpm:8.1 || true docker pull adhocore/phpfpm:8.2 || true docker pull adhocore/phpfpm:8.3 || true + docker pull adhocore/phpfpm:8.4 || true + + - name: "[8.4] Build and push" + id: docker_build_84 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.4.Dockerfile + tags: adhocore/phpfpm:8.4,adhocore/phpfpm:latest + platforms: linux/amd64,linux/arm64 - name: "[8.3] Build and push" id: docker_build_83 diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index c6a08a9..41c73c4 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -19,11 +19,11 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: "[8.3r] Build and push" - id: docker_build_83 + - name: "[8.4] Build and push" + id: docker_build_84 uses: docker/build-push-action@v4 with: push: true file: 8.3.Dockerfile - tags: adhocore/phpfpm:8.3r,adhocore/phpfpm:8.3rc + tags: adhocore/phpfpm:8.4,adhocore/phpfpm:8.4 platforms: linux/amd64,linux/arm64 From 806ee50c4b93a88a1367f4422fd4f19dfeb762c9 Mon Sep 17 00:00:00 2001 From: Luis Gonzalez Date: Fri, 6 Dec 2024 11:39:55 -0600 Subject: [PATCH 306/311] Updating docs --- README.md | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 209d31c..3cb051d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Check [example](#extensions) below how to add them back in your images based off Docker PHP FPM with lean alpine base. The download size is just about **~100MB** - tiny given how many extensions it has baked in. -It contains PHP>=8.3.4, PHP>=8.2.17, PHP>=8.1.27 and PHP>=8.0.30 with plenty of common and useful extensions. +It contains PHP>=8.4.1, PHP>=8.3.4, PHP>=8.2.17, PHP>=8.1.27 and PHP>=8.0.30 with plenty of common and useful extensions. If you are looking for a complete local development stack then check [`adhocore/lemp`](https://github.com/adhocore/docker-lemp). @@ -26,6 +26,9 @@ The images are always latest, everytime a new PHP version comes out and its offi To pull latest image: ```sh +# for php >=8.4.1 +docker pull adhocore/phpfpm:8.4 + # for php >=8.3.4 docker pull adhocore/phpfpm:8.3 @@ -72,7 +75,7 @@ Latest versions of both Composer v1 and v2 are installed already. You can run v2 You can add new extensions in your image like so: ```Dockerfile -FROM adhocore/phpfpm:8.3 # or 8.2, 8.1 +FROM adhocore/phpfpm:8.4 # or 8.3, 8.2 RUN \ # setup @@ -94,6 +97,27 @@ just run `docker-php-ext-enable xdebug` to enable it again without having to reb Below you can find list of extensions by image tags. +### PHP8.4 + +``` +PHP 8.4.1, Total extensions: 60 +- bcmath - bz2 - calendar - core +- ctype - curl - date - dom +- exif - fileinfo - filter - fpm +- ftp - gd - gettext - gmp +- hash - iconv - imap - intl +- json - ldap - libxml - mbstring +- mysqli - mysqlnd - openssl - pcntl +- pcre - pdo - pdo_mysql - pdo_pgsql +- pdo_sqlite - pgsql - phar - posix +- pspell - random - readline - reflection +- session - shmop - simplexml - soap +- sodium - spl - sqlite3 - standard +- sysvmsg - sysvsem - sysvshm - tidy +- tokenizer - xdebug - xml - xmlreader +- xmlwriter - xsl - zip - zlib +``` + ### PHP8.3 ``` @@ -238,10 +262,10 @@ Read more about ### Production Usage For production you may want to get rid of some extensions that are not really required. -In such case, you can build a custom image on top `adhocore/phpfpm:8.2` like so: +In such case, you can build a custom image on top `adhocore/phpfpm:8.4` like so: ```Dockerfile -FROM adhocore/phpfpm:8.2 # or 8.1 or 8.0 +FROM adhocore/phpfpm:8.4 # or 8.3 or 8.2 # Disable extensions you won't need. You can add as much as you want separated by space. RUN docker-php-ext-disable xdebug pcov ldap From 2faf95cbdc000c33f0621a7ab68b4cab6366e57a Mon Sep 17 00:00:00 2001 From: Luis Gonzalez Date: Wed, 11 Dec 2024 23:14:50 -0600 Subject: [PATCH 307/311] Update 8.4.Dockerfile --- 8.4.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/8.4.Dockerfile b/8.4.Dockerfile index a512eea..11736b5 100644 --- a/8.4.Dockerfile +++ b/8.4.Dockerfile @@ -15,8 +15,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.4 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ -COPY --from=adhocore/phpfpm:8.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +# COPY --from=adhocore/phpfpm:8.4 /usr/local/lib/php/extensions/no-debug-non-zts-20230831/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/## +# COPY --from=adhocore/phpfpm:8.4 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php From b31a66e5c271b695027150059d4222a74894d589 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 14 Dec 2024 05:39:29 +0545 Subject: [PATCH 308/311] chore: build 8.4 last --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a4fd8c..84aa436 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,15 +29,6 @@ jobs: docker pull adhocore/phpfpm:8.3 || true docker pull adhocore/phpfpm:8.4 || true - - name: "[8.4] Build and push" - id: docker_build_84 - uses: docker/build-push-action@v4 - with: - push: true - file: 8.4.Dockerfile - tags: adhocore/phpfpm:8.4,adhocore/phpfpm:latest - platforms: linux/amd64,linux/arm64 - - name: "[8.3] Build and push" id: docker_build_83 uses: docker/build-push-action@v4 @@ -74,3 +65,11 @@ jobs: tags: adhocore/phpfpm:8.0 platforms: linux/amd64,linux/arm64 + - name: "[8.4] Build and push" + id: docker_build_84 + uses: docker/build-push-action@v4 + with: + push: true + file: 8.4.Dockerfile + tags: adhocore/phpfpm:8.4,adhocore/phpfpm:latest + platforms: linux/amd64,linux/arm64 From c8b98d2bd774c4d3f1977338d899ff268c53f646 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 14 Dec 2024 05:43:08 +0545 Subject: [PATCH 309/311] feat: bump 8.3 to 8.3.14 --- 8.3.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.3.Dockerfile b/8.3.Dockerfile index 2048e17..a89b2ce 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.11-fpm-alpine3.20 +FROM php:8.3.14-fpm-alpine3.21 MAINTAINER Jitendra Adhikari From 08bb625764ba01dbd190ac03cedd465f8208c06a Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 14 Dec 2024 05:45:08 +0545 Subject: [PATCH 310/311] feat: bump 8.2 to 8.2.26 --- 8.2.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 4aa61d4..5b4ef81 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.23-fpm-alpine3.20 +FROM php:8.2.26-fpm-alpine3.21 MAINTAINER Jitendra Adhikari From 5d47af7213b3ded64cc959c83cb8327945fcb5a9 Mon Sep 17 00:00:00 2001 From: Jitendra Adhikari <2908547+adhocore@users.noreply.github.com> Date: Sat, 14 Dec 2024 05:47:03 +0545 Subject: [PATCH 311/311] feat: bump 8.1 to 8.1.31 --- 8.1.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 4f52ce6..7220a92 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.29-fpm-alpine3.20 +FROM php:8.1.31-fpm-alpine3.21 MAINTAINER Jitendra Adhikari