From fced35368e590a4baf32cf6c97fda942ba159d40 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Wed, 17 Aug 2022 22:19:09 +0800 Subject: [PATCH] [Composer] Update to v2.3.10 Signed-off-by: Kang Huaishuai --- README.cn.md | 2 +- README.md | 2 +- app/demo/.drone.yml | 4 ++-- app/demo/.pcit.yml | 2 +- dockerfile/php/.env.example | 2 +- dockerfile/php/7.2/composer/Dockerfile | 6 +++--- dockerfile/php/7.2/stretch/Dockerfile | 6 +++--- dockerfile/php/7.3/composer/Dockerfile | 6 +++--- dockerfile/php/7.4/composer/Dockerfile | 6 +++--- dockerfile/php/8.0/composer/Dockerfile | 6 +++--- dockerfile/php/8.1/composer/Dockerfile | 6 +++--- dockerfile/php/8.2/composer/Dockerfile | 6 +++--- dockerfile/php/nightly/composer/Dockerfile | 6 +++--- scripts/docker-compose.bump.yml | 2 +- windows/lnmp-windows-pm-repo/composer/lwpm.json | 4 ++-- wsl/Dockerfile | 2 +- wsl/lnmp-wsl-builder-php | 2 +- wsl/lnmp-wsl-builder-php-rhel | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/README.cn.md b/README.cn.md index 2117f9c2a..27efe7e71 100644 --- a/README.cn.md +++ b/README.cn.md @@ -208,7 +208,7 @@ $ ./lnmp-docker down |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.4-fpm-alpine` | **8.1.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.2.7** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.3.10** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/README.md b/README.md index c68164d39..f79a6858d 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ Please see [Documents](https://github.com/khs1994-docker/lnmp/tree/master/docs#% |[MariaDB](https://github.com/docker-library/docs/tree/master/mariadb) |`mariadb:10.8.3` | **10.8.3** |`ubuntu:jammy` | |[Redis](https://github.com/docker-library/docs/tree/master/redis) |`redis:7.0.0-alpine` | **7.0.0** |`alpine:3.16` | |[PHP-FPM](https://github.com/khs1994-docker/php) |`khs1994/php:8.1.4-fpm-alpine` | **8.1.4** |`alpine:3.16` | -|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.2.7** |`alpine:3.16` | +|[Composer](https://github.com/docker-library/docs/tree/master/composer) |`khs1994/php:8.1.4-composer-alpine`| **2.3.10** |`alpine:3.16` | |[Memcached](https://github.com/docker-library/docs/tree/master/memcached) |`memcached:1.6.15-alpine` | **1.6.15** |`alpine:3.16` | |[RabbitMQ](https://github.com/docker-library/docs/tree/master/rabbitmq) |`rabbitmq:3.9.0-management-alpine` | **3.9.0** |`alpine:3.13` | |[PostgreSQL](https://github.com/docker-library/docs/tree/master/postgres) |`postgres:14.0-alpine` | **14.0** |`alpine:3.14` | diff --git a/app/demo/.drone.yml b/app/demo/.drone.yml index 5036e916c..fa0485532 100644 --- a/app/demo/.drone.yml +++ b/app/demo/.drone.yml @@ -33,7 +33,7 @@ clone: steps: # install dep - name: install - # image: composer:2.2.7 + # image: composer:2.3.10 image: khs1994/php:8.1.4-composer-alpine commands: - pwd @@ -226,7 +226,7 @@ volumes: # matrix: # COMPOSER_VERSION: -# - 2.2.7 +# - 2.3.10 # PHP_VERSION: # - 8.1.4 # - 8.0.18 diff --git a/app/demo/.pcit.yml b/app/demo/.pcit.yml index a5ab10357..a6a5ed929 100644 --- a/app/demo/.pcit.yml +++ b/app/demo/.pcit.yml @@ -127,7 +127,7 @@ services: jobs: COMPOSER_VERSION: - - 2.2.7 + - 2.3.10 PHP_VERSION: - 8.1.4 - 8.0.18 diff --git a/dockerfile/php/.env.example b/dockerfile/php/.env.example index 046baeda6..e687d515e 100644 --- a/dockerfile/php/.env.example +++ b/dockerfile/php/.env.example @@ -12,7 +12,7 @@ PHP_VERSION_70=7.0.33 PHP_VERSION_56=5.6.40 # https://github.com/composer/composer/tags -COMPOSER_VERSION=2.2.7 +COMPOSER_VERSION=2.3.10 # https://github.com/swoole/swoole-src/tags SWOOLE_VERSION=5.0.0 # https://github.com/nginx/unit/tags diff --git a/dockerfile/php/7.2/composer/Dockerfile b/dockerfile/php/7.2/composer/Dockerfile index af389a2fe..0c2d9e83b 100644 --- a/dockerfile/php/7.2/composer/Dockerfile +++ b/dockerfile/php/7.2/composer/Dockerfile @@ -18,12 +18,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -39,7 +39,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/7.2/stretch/Dockerfile b/dockerfile/php/7.2/stretch/Dockerfile index fd70f19c4..5640d7eb1 100644 --- a/dockerfile/php/7.2/stretch/Dockerfile +++ b/dockerfile/php/7.2/stretch/Dockerfile @@ -160,12 +160,12 @@ RUN sed -i "s!deb.debian.org!${DEB_URL}!g" /etc/apt/sources.list \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && { echo "memory_limit=-1"; \ echo "date.timezone=${PHP_TIMEZONE:-PRC}"; \ @@ -180,7 +180,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh > /docker-entrypoint.composer \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh > /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ && composer --ansi --version --no-interaction \ diff --git a/dockerfile/php/7.3/composer/Dockerfile b/dockerfile/php/7.3/composer/Dockerfile index 72e525ce3..7553f7d0f 100644 --- a/dockerfile/php/7.3/composer/Dockerfile +++ b/dockerfile/php/7.3/composer/Dockerfile @@ -18,12 +18,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -39,7 +39,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/7.4/composer/Dockerfile b/dockerfile/php/7.4/composer/Dockerfile index 07200d8b6..cfb67d4c7 100644 --- a/dockerfile/php/7.4/composer/Dockerfile +++ b/dockerfile/php/7.4/composer/Dockerfile @@ -27,12 +27,12 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \ # COMPOSER_MEMORY_LIMIT= \ COMPOSER_PROCESS_TIMEOUT=300 \ # COMPOSER_SELF_UPDATE_TARGET= \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -48,7 +48,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/8.0/composer/Dockerfile b/dockerfile/php/8.0/composer/Dockerfile index eb89180e4..ca14b8ad1 100644 --- a/dockerfile/php/8.0/composer/Dockerfile +++ b/dockerfile/php/8.0/composer/Dockerfile @@ -18,12 +18,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -39,7 +39,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/8.1/composer/Dockerfile b/dockerfile/php/8.1/composer/Dockerfile index 8e6802856..738a20744 100644 --- a/dockerfile/php/8.1/composer/Dockerfile +++ b/dockerfile/php/8.1/composer/Dockerfile @@ -18,12 +18,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -39,7 +39,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/8.2/composer/Dockerfile b/dockerfile/php/8.2/composer/Dockerfile index 4e7a5f8bc..2f6c27d2d 100644 --- a/dockerfile/php/8.2/composer/Dockerfile +++ b/dockerfile/php/8.2/composer/Dockerfile @@ -18,12 +18,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -39,7 +39,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/dockerfile/php/nightly/composer/Dockerfile b/dockerfile/php/nightly/composer/Dockerfile index 057da7323..35b21c77e 100644 --- a/dockerfile/php/nightly/composer/Dockerfile +++ b/dockerfile/php/nightly/composer/Dockerfile @@ -23,12 +23,12 @@ ENV COMPOSER_DEP_APKS \ ENV COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/tmp/composer \ COMPOSER_NO_INTERACTION=1 \ - COMPOSER_VERSION=2.2.7 \ + COMPOSER_VERSION=2.3.10 \ PS1="[\u@\h \w]# " # https://github.com/composer/docker -RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/bin/composer \ +RUN --mount=type=bind,from=composer:2.3.10,source=/usr/bin/composer,target=/opt/bin/composer \ set -x \ && apk add --no-cache --virtual .composer_deps $COMPOSER_DEP_APKS \ && { echo "memory_limit=-1"; \ @@ -44,7 +44,7 @@ RUN --mount=type=bind,from=composer:2.2.7,source=/usr/bin/composer,target=/opt/b # exit(1); \ # }" \ # && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \ - && curl -fsSL https://raw.githubusercontent.com/composer/docker/622ed016babc9c89ab72f7fe6b037f6a312f0f0a/2.2/docker-entrypoint.sh \ + && curl -fsSL https://raw.githubusercontent.com/composer/docker/493d91e44e4d5245e80ff9462f2653c7d7de9a8c/2.4/docker-entrypoint.sh \ -o /docker-entrypoint.composer \ && chmod +x /docker-entrypoint.composer \ && cp -a /opt/bin/composer /usr/bin/composer \ diff --git a/scripts/docker-compose.bump.yml b/scripts/docker-compose.bump.yml index bd8d71a4d..ec7d85bcf 100644 --- a/scripts/docker-compose.bump.yml +++ b/scripts/docker-compose.bump.yml @@ -17,7 +17,7 @@ services: image: php:8.1.4-fpm-alpine composer: - image: composer:2.2.7 + image: composer:2.3.10 nginx: image: nginx:1.21.3-alpine diff --git a/windows/lnmp-windows-pm-repo/composer/lwpm.json b/windows/lnmp-windows-pm-repo/composer/lwpm.json index 2ea194141..1a9511031 100644 --- a/windows/lnmp-windows-pm-repo/composer/lwpm.json +++ b/windows/lnmp-windows-pm-repo/composer/lwpm.json @@ -1,8 +1,8 @@ { "name": "composer", "description": "Dependency Manager for PHP", - "version": "2.2.7", - "pre-version": "2.2.7", + "version": "2.3.10", + "pre-version": "2.3.10", "homepage": "https://getcomposer.org/", "bug": "https://github.com/composer/composer/issues", "github": "composer/composer", diff --git a/wsl/Dockerfile b/wsl/Dockerfile index c25d38e1a..85b40ba22 100755 --- a/wsl/Dockerfile +++ b/wsl/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PREFIX=/usr/local/php73 ARG PHP_INI_DIR=/usr/local/etc/php73 -ARG COMPOSER_VERSION=2.2.7 +ARG COMPOSER_VERSION=2.3.10 ENV COMPOSER_ALLOW_SUPERUSER=1 diff --git a/wsl/lnmp-wsl-builder-php b/wsl/lnmp-wsl-builder-php index 941ff4124..a9e3b82c2 100755 --- a/wsl/lnmp-wsl-builder-php +++ b/wsl/lnmp-wsl-builder-php @@ -59,7 +59,7 @@ fi PHP_INSTALL_LOG=/tmp/php-builder/$(date +%s).install.log -export COMPOSER_VERSION=2.2.7 +export COMPOSER_VERSION=2.3.10 export COMPOSER_ALLOW_SUPERUSER=1 export COMPOSER_HOME=/tmp/composer export TZ=Asia/Shanghai diff --git a/wsl/lnmp-wsl-builder-php-rhel b/wsl/lnmp-wsl-builder-php-rhel index f226da006..4d82f7508 100755 --- a/wsl/lnmp-wsl-builder-php-rhel +++ b/wsl/lnmp-wsl-builder-php-rhel @@ -49,7 +49,7 @@ if [ "${LNMP_CN_ENV}" != 'false' ];then PHP_GIT=https://github.com.cnpmjs.org/php/php-src fi -export COMPOSER_VERSION=2.2.7 +export COMPOSER_VERSION=2.3.10 export COMPOSER_ALLOW_SUPERUSER=1 export COMPOSER_HOME=/tmp/composer export TZ=Asia/Shanghai