[Composer] Update to v2.3.10

Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
khs1994-docker · Aug 17, 2022 · fced353 · fced353
1 parent 6142f4b
commit fced353
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ services: @@
     jobs:
       COMPOSER_VERSION:
-        - 2.2.7
+        - 2.3.10
       PHP_VERSION:
         - 8.1.4
         - 8.0.18
@@ Expand Down @@