chore: 更新个人自定义配置

docker-compose.11ze.yml

@@ -44,6 +44,7 @@ services:
       args:
         PHP_VERSION: php:${PHP82_VERSION}-fpm-alpine
         CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
+        COMPOSER_URL: ${COMPOSER_URL}
         PHP_EXTENSIONS: ${PHP82_EXTENSIONS}
         INSTALL_APPS: ${PHP_INSTALL_APPS}
         TZ: '$TZ'
@@ -69,6 +70,7 @@ services:
   #      args:
   #        PHP_VERSION: php:${PHP80_VERSION}-fpm-alpine
   #        CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
+  #        COMPOSER_URL: ${COMPOSER_URL}
   #        PHP_EXTENSIONS: ${PHP80_EXTENSIONS}
   #        INSTALL_APPS: ${PHP_INSTALL_APPS}
   #        TZ: "$TZ"
@@ -92,6 +94,7 @@ services:
       args:
         PHP_VERSION: php:${PHP74_VERSION}-fpm-alpine
         CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
+        COMPOSER_URL: ${COMPOSER_URL}
         PHP_EXTENSIONS: ${PHP74_EXTENSIONS}
         INSTALL_APPS: ${PHP_INSTALL_APPS}
         TZ: '$TZ'
@@ -115,6 +118,7 @@ services:
       args:
         PHP_VERSION: php:${PHP73_VERSION}-fpm-alpine
         CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
+        COMPOSER_URL: ${COMPOSER_URL}
         PHP_EXTENSIONS: ${PHP73_EXTENSIONS}
         INSTALL_APPS: ${PHP_INSTALL_APPS}
         TZ: '$TZ'

env.11ze

@@ -21,11 +21,25 @@ TZ=Asia/Shanghai
 # Can be empty, followings or others:
 # mirrors.163.com
 # mirrors.aliyun.com
+# mirrors.tencent.com
 # mirrors.ustc.edu.cn
 # dl-cdn.alpinelinux.org
 #
 CONTAINER_PACKAGE_URL=mirrors.ustc.edu.cn
 
+#
+# Composer url
+#
+# Can be empty, followings or others:
+#
+# packagist.laravel-china.org
+# packagist.phpcomposer.com
+# mirrors.aliyun.com
+# mirrors.tencent.com
+# repo.packagist.org
+COMPOSER_URL=mirrors.tencent.com
+
+
 #
 #ALPINE
 #
@@ -256,13 +270,13 @@ MYSQL5_COMMAND=--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode
 #
 # Redis6
 #
-REDIS6_VERSION=6.2.14
+REDIS6_VERSION=6.2-alpine
 REDIS6_CONF_FILE=./services/redis6/redis.conf
 REDIS6_HOST_PORT=63796
 #
 # Redis7
 #
-REDIS7_VERSION=7.2.3
+REDIS7_VERSION=7.2-alpine
 REDIS7_CONF_FILE=./services/redis7/redis.conf
 REDIS7_HOST_PORT=63797
 

services/php82/Dockerfile

@@ -5,12 +5,13 @@ FROM ${PHP_VERSION}
 ARG TZ
 ARG PHP_EXTENSIONS
 ARG CONTAINER_PACKAGE_URL
-
+ARG COMPOSER_URL
 
 RUN if [ "${CONTAINER_PACKAGE_URL}" != "" ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi
 
 COPY ./extensions /tmp/extensions
 WORKDIR /tmp/extensions
+
 RUN chmod +x install.sh \
     && sh install.sh \
     && rm -rf /tmp/extensions
@@ -19,7 +20,7 @@ ADD ./extensions/install-php-extensions  /usr/local/bin/
 
 RUN chmod uga+x /usr/local/bin/install-php-extensions
 
-RUN apk --no-cache add tzdata libreoffice \
+RUN apk --no-cache add tzdata \
     # 下面这部分是 wkhtmltopdf 需要的依赖
     libstdc++ \
     libx11 \
@@ -35,6 +36,7 @@ RUN apk --no-cache add tzdata libreoffice \
     # ttf-dejavu \ # 中文字体，但还是使用下面 front/* 的中文字体
     # && rm -rf /var/cache/apk/* \
     # 上面这部分是 wkhtmltopdf 需要的依赖
+    libreoffice \
     mysql-client \
     && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \
     && echo "$TZ" > /etc/timezone
@@ -46,7 +48,7 @@ ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
 
 
 # Install composer and change it's cache home
-RUN curl -o /usr/bin/composer https://mirrors.aliyun.com/composer/composer.phar \
+RUN curl -o /usr/bin/composer https://${COMPOSER_URL}/composer/composer.phar \
     && chmod +x /usr/bin/composer
 ENV COMPOSER_HOME=/tmp/composer