From 90110fd93903833c2f17f822620d3e7a9d15f2b0 Mon Sep 17 00:00:00 2001 From: tianfenghan Date: Mon, 5 Oct 2026 14:34:13 +0800 Subject: [PATCH 1/2] ci: migrate Debian PHP images to Trixie --- .github/workflows/debian.yml | 31 ++++++++++++++------- 8.1-zts/Dockerfile | 52 ------------------------------------ 8.1/Dockerfile | 52 ------------------------------------ 8.2-zts/Dockerfile | 7 +++-- 8.2/Dockerfile | 7 +++-- 8.3-zts/Dockerfile | 7 +++-- 8.3/Dockerfile | 7 +++-- 8.4-zts/Dockerfile | 7 +++-- 8.4/Dockerfile | 7 +++-- 8.5-zts/Dockerfile | 7 +++-- 8.5/Dockerfile | 7 +++-- README.md | 9 +++++++ generator | 8 +++--- templates/debian.php | 5 ++-- 14 files changed, 61 insertions(+), 152 deletions(-) delete mode 100644 8.1-zts/Dockerfile delete mode 100644 8.1/Dockerfile diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 2ccd0d3..c8ee548 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -2,6 +2,12 @@ name: Build Versioned Images on: workflow_dispatch: + pull_request: + paths: + - generator + - templates/debian.php + - '8.*/Dockerfile' + - .github/workflows/debian.yml push: branches: - master @@ -11,9 +17,9 @@ jobs: if: ${{ github.repository == 'swoole/php-docker' }} runs-on: ubuntu-latest strategy: - fail-fast: true + fail-fast: false matrix: - php: ['8.1', '8.2', '8.3', '8.4', '8.5', '8.1-zts', '8.2-zts', '8.3-zts', '8.4-zts', '8.5-zts'] + php: ['8.2', '8.3', '8.4', '8.5', '8.2-zts', '8.3-zts', '8.4-zts', '8.5-zts'] name: PHP-${{ matrix.php }} @@ -25,16 +31,12 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to DockerHub + if: github.event_name != 'pull_request' uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set output parameters - id: params - run: | - echo "::set-output name=full_names::phpswoole/php:${{ matrix.php }}" - - name: Build and push Docker image phpswoole/php:${{ matrix.php }} id: docker_build uses: docker/build-push-action@v6 @@ -42,8 +44,19 @@ jobs: context: . file: ${{ matrix.php }}/Dockerfile platforms: linux/amd64 - push: true - tags: ${{ steps.params.outputs.full_names }} + push: ${{ github.event_name != 'pull_request' }} + load: true + tags: | + phpswoole/php:${{ matrix.php }} + phpswoole/php:${{ matrix.php }}-trixie + + - name: Verify Debian and libcurl versions + run: | + docker run --rm phpswoole/php:${{ matrix.php }}-trixie sh -ec ' + . /etc/os-release + test "$VERSION_CODENAME" = trixie + php -r '\''$curl = curl_version(); echo "libcurl: {$curl["version"]}\n"; exit(version_compare($curl["version"], "8.0.0", "<") || !($curl["features"] & CURL_VERSION_HTTP2) ? 1 : 0);'\'' + ' - name: Image digest of phpswoole/php:${{ matrix.php }} run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/8.1-zts/Dockerfile b/8.1-zts/Dockerfile deleted file mode 100644 index 934de95..0000000 --- a/8.1-zts/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM php:8.1-zts-bookworm -LABEL maintainer="Swoole Team " - -RUN apt update -y - -RUN apt install -y \ - procps \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - openssl \ - libssh-dev \ - libpcre3 \ - libpcre3-dev \ - libonig-dev \ - libcurl4-openssl-dev \ - libc-ares-dev \ - libbrotli-dev \ - libpq-dev \ - unixodbc-dev \ - odbc-mariadb \ - curl \ - wget \ - zip \ - unzip \ - git \ - vim - -RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ - gd \ - pdo_mysql \ - mysqli \ - opcache \ - sockets \ - pcntl && \ - echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \ - pecl install redis && docker-php-ext-enable redis - -# install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 -RUN curl -sS https://getcomposer.org/installer | php && \ - mv composer.phar /usr/local/bin/composer && \ - composer self-update --clean-backups - -# dev-tools -RUN apt install -y \ - gdb \ - strace \ - valgrind - -# clean up -RUN apt autoremove && apt clean diff --git a/8.1/Dockerfile b/8.1/Dockerfile deleted file mode 100644 index af0c95d..0000000 --- a/8.1/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM php:8.1-bookworm -LABEL maintainer="Swoole Team " - -RUN apt update -y - -RUN apt install -y \ - procps \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - openssl \ - libssh-dev \ - libpcre3 \ - libpcre3-dev \ - libonig-dev \ - libcurl4-openssl-dev \ - libc-ares-dev \ - libbrotli-dev \ - libpq-dev \ - unixodbc-dev \ - odbc-mariadb \ - curl \ - wget \ - zip \ - unzip \ - git \ - vim - -RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ - gd \ - pdo_mysql \ - mysqli \ - opcache \ - sockets \ - pcntl && \ - echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \ - pecl install redis && docker-php-ext-enable redis - -# install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 -RUN curl -sS https://getcomposer.org/installer | php && \ - mv composer.phar /usr/local/bin/composer && \ - composer self-update --clean-backups - -# dev-tools -RUN apt install -y \ - gdb \ - strace \ - valgrind - -# clean up -RUN apt autoremove && apt clean diff --git a/8.2-zts/Dockerfile b/8.2-zts/Dockerfile index 62b5f04..4a59aab 100644 --- a/8.2-zts/Dockerfile +++ b/8.2-zts/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.2-zts-bookworm +FROM php:8.2-zts-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 9aedd69..336e5c8 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.2-bookworm +FROM php:8.2-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.3-zts/Dockerfile b/8.3-zts/Dockerfile index 97bdf3c..929bbdd 100644 --- a/8.3-zts/Dockerfile +++ b/8.3-zts/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.3-zts-bookworm +FROM php:8.3-zts-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 953992f..cd4f9ce 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.3-bookworm +FROM php:8.3-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.4-zts/Dockerfile b/8.4-zts/Dockerfile index 847c1cc..1001b11 100644 --- a/8.4-zts/Dockerfile +++ b/8.4-zts/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.4-zts-bookworm +FROM php:8.4-zts-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 1930026..3c231e6 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.4-bookworm +FROM php:8.4-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.5-zts/Dockerfile b/8.5-zts/Dockerfile index 8619e52..8c77beb 100644 --- a/8.5-zts/Dockerfile +++ b/8.5-zts/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.5-zts-bookworm +FROM php:8.5-zts-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/8.5/Dockerfile b/8.5/Dockerfile index eda878f..0ddd81d 100644 --- a/8.5/Dockerfile +++ b/8.5/Dockerfile @@ -1,17 +1,16 @@ -FROM php:8.5-bookworm +FROM php:8.5-trixie LABEL maintainer="Swoole Team " RUN apt update -y RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ diff --git a/README.md b/README.md index 8a62776..3df1d4c 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,15 @@ Only for development and CI environments, integrated compiler, header files, deb The size of the image is too large, do not use it in a production environment +## base images + +Debian images use the official `php:-trixie` and +`php:-zts-trixie` images for PHP 8.2 through 8.5. libcurl and other +system libraries come from Debian Trixie packages. + +PHP 8.1 Debian builds are retired because official Trixie images are unavailable. +Alpine images remain available for Alpine compatibility testing. + ## generate Dockerfile ```php diff --git a/generator b/generator index f308cfe..c9467f7 100755 --- a/generator +++ b/generator @@ -2,14 +2,14 @@ make(); \ No newline at end of file +(new DockerfileGenerator())->make(); diff --git a/templates/debian.php b/templates/debian.php index ccd6162..f0e17c3 100644 --- a/templates/debian.php +++ b/templates/debian.php @@ -6,13 +6,12 @@ RUN apt install -y \ procps \ - libfreetype6-dev \ + libfreetype-dev \ libjpeg62-turbo-dev \ libpng-dev \ openssl \ libssh-dev \ - libpcre3 \ - libpcre3-dev \ + libpcre2-dev \ libonig-dev \ libcurl4-openssl-dev \ libc-ares-dev \ From 7c664385b95a5c5b01555bff80bb06b3640c5b43 Mon Sep 17 00:00:00 2001 From: tianfenghan Date: Mon, 5 Oct 2026 14:42:47 +0800 Subject: [PATCH 2/2] fix(docker): use key=value syntax for Composer environment --- 8.1-alpine/Dockerfile | 2 +- 8.1-zts-alpine/Dockerfile | 2 +- 8.2-alpine/Dockerfile | 2 +- 8.2-zts-alpine/Dockerfile | 2 +- 8.2-zts/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3-alpine/Dockerfile | 2 +- 8.3-zts-alpine/Dockerfile | 2 +- 8.3-zts/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 8.4-alpine/Dockerfile | 2 +- 8.4-zts-alpine/Dockerfile | 2 +- 8.4-zts/Dockerfile | 2 +- 8.4/Dockerfile | 2 +- 8.5-alpine/Dockerfile | 2 +- 8.5-zts-alpine/Dockerfile | 2 +- 8.5-zts/Dockerfile | 2 +- 8.5/Dockerfile | 2 +- templates/alpine.php | 2 +- templates/debian.php | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/8.1-alpine/Dockerfile b/8.1-alpine/Dockerfile index 22c205d..da87ea0 100644 --- a/8.1-alpine/Dockerfile +++ b/8.1-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.1-zts-alpine/Dockerfile b/8.1-zts-alpine/Dockerfile index a18ed25..b89582b 100644 --- a/8.1-zts-alpine/Dockerfile +++ b/8.1-zts-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.2-alpine/Dockerfile b/8.2-alpine/Dockerfile index de07d1d..038e558 100644 --- a/8.2-alpine/Dockerfile +++ b/8.2-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.2-zts-alpine/Dockerfile b/8.2-zts-alpine/Dockerfile index 30fd98f..7c80948 100644 --- a/8.2-zts-alpine/Dockerfile +++ b/8.2-zts-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.2-zts/Dockerfile b/8.2-zts/Dockerfile index 4a59aab..82cdd1d 100644 --- a/8.2-zts/Dockerfile +++ b/8.2-zts/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 336e5c8..db86400 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.3-alpine/Dockerfile b/8.3-alpine/Dockerfile index 58d038a..32b843a 100644 --- a/8.3-alpine/Dockerfile +++ b/8.3-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.3-zts-alpine/Dockerfile b/8.3-zts-alpine/Dockerfile index 063f16f..9d0e6a3 100644 --- a/8.3-zts-alpine/Dockerfile +++ b/8.3-zts-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.3-zts/Dockerfile b/8.3-zts/Dockerfile index 929bbdd..f8351f2 100644 --- a/8.3-zts/Dockerfile +++ b/8.3-zts/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.3/Dockerfile b/8.3/Dockerfile index cd4f9ce..8ec1e4e 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.4-alpine/Dockerfile b/8.4-alpine/Dockerfile index 1e86dd7..7ae5eb8 100644 --- a/8.4-alpine/Dockerfile +++ b/8.4-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.4-zts-alpine/Dockerfile b/8.4-zts-alpine/Dockerfile index 46346a0..5b6557b 100644 --- a/8.4-zts-alpine/Dockerfile +++ b/8.4-zts-alpine/Dockerfile @@ -53,7 +53,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.4-zts/Dockerfile b/8.4-zts/Dockerfile index 1001b11..f07ed6d 100644 --- a/8.4-zts/Dockerfile +++ b/8.4-zts/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 3c231e6..c5dcf0e 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -36,7 +36,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.5-alpine/Dockerfile b/8.5-alpine/Dockerfile index 9df3a3e..c2b43d9 100644 --- a/8.5-alpine/Dockerfile +++ b/8.5-alpine/Dockerfile @@ -52,7 +52,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.5-zts-alpine/Dockerfile b/8.5-zts-alpine/Dockerfile index 5588dc0..917c6c9 100644 --- a/8.5-zts-alpine/Dockerfile +++ b/8.5-zts-alpine/Dockerfile @@ -52,7 +52,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.5-zts/Dockerfile b/8.5-zts/Dockerfile index 8c77beb..4617a22 100644 --- a/8.5-zts/Dockerfile +++ b/8.5-zts/Dockerfile @@ -35,7 +35,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 0ddd81d..7d8c534 100644 --- a/8.5/Dockerfile +++ b/8.5/Dockerfile @@ -35,7 +35,7 @@ RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/templates/alpine.php b/templates/alpine.php index 62f224c..2010f45 100644 --- a/templates/alpine.php +++ b/templates/alpine.php @@ -58,7 +58,7 @@ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups diff --git a/templates/debian.php b/templates/debian.php index f0e17c3..418639e 100644 --- a/templates/debian.php +++ b/templates/debian.php @@ -41,7 +41,7 @@ pecl install redis && docker-php-ext-enable redis # install composer -ENV COMPOSER_ALLOW_SUPERUSER 1 +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ composer self-update --clean-backups