From ea86e785de408c2504af18a8f8b1355e9993d7af Mon Sep 17 00:00:00 2001 From: xuyang Date: Tue, 7 Jan 2025 09:14:42 +0800 Subject: [PATCH] =?UTF-8?q?php53=E5=AE=89=E8=A3=85yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++-- hosts | 2 +- services/nginx/conf.d/gaore.com.conf | 2 +- services/nginx/conf.d/pay.gaore.com.conf | 2 +- services/nginx/conf.d/sdk.gaore.com.conf | 2 +- services/php53/Dockerfile | 13 +++++++++++-- services/php53/extensions/install.sh | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.env b/.env index ffa8c13..82de5fb 100644 --- a/.env +++ b/.env @@ -21,8 +21,8 @@ TZ=Asia/Shanghai # mirrors.aliyun.com # mirrors.ustc.edu.cn # -CONTAINER_PACKAGE_URL=mirrors.aliyun.com -# CONTAINER_PACKAGE_URL=mirrors.163.com +# CONTAINER_PACKAGE_URL=mirrors.aliyun.com +CONTAINER_PACKAGE_URL=mirrors.163.com # # Nginx diff --git a/hosts b/hosts index db1eda1..6c4de9f 100644 --- a/hosts +++ b/hosts @@ -1,5 +1,5 @@ 172.20.0.254 mkt.api.gaore.com mkt.gaore.com 172.20.0.254 callback.api.gaore.com 172.20.0.254 stat.gaore.com -172.20.0.254 msdk.gaore.com msdk.api.gaore.com game.gaore.com +172.20.0.254 msdk.gaore.com msdk.api.gaore.com game.gaore.com pay.api.gaore.com 192.168.1.202 sso.gaore.com admintest.gaore.com oss.gaore.com \ No newline at end of file diff --git a/services/nginx/conf.d/gaore.com.conf b/services/nginx/conf.d/gaore.com.conf index 3bdfe5a..4681ef6 100644 --- a/services/nginx/conf.d/gaore.com.conf +++ b/services/nginx/conf.d/gaore.com.conf @@ -76,7 +76,7 @@ server { server { listen 80; - server_name msdk.gaore.com; + server_name msdk.gaore.com msdk.api.gaore.com; index index.php; root /www/gaore/msdk.gaore.com; diff --git a/services/nginx/conf.d/pay.gaore.com.conf b/services/nginx/conf.d/pay.gaore.com.conf index af9d215..eb29e1e 100644 --- a/services/nginx/conf.d/pay.gaore.com.conf +++ b/services/nginx/conf.d/pay.gaore.com.conf @@ -2,7 +2,7 @@ # pay.gaore.com server { listen 80; - server_name pay.gaore.com; + server_name pay.gaore.com pay.api.gaore.com; index index.php; root /www/gaore/pay.gaore.com/public; diff --git a/services/nginx/conf.d/sdk.gaore.com.conf b/services/nginx/conf.d/sdk.gaore.com.conf index 2da72c8..d7af5f6 100644 --- a/services/nginx/conf.d/sdk.gaore.com.conf +++ b/services/nginx/conf.d/sdk.gaore.com.conf @@ -2,7 +2,7 @@ # sdk.gaore.com server { listen 80; - server_name sdk.gaore.com; + server_name sdk.gaore.com xcx.uu89.com; index index.php; root /www/gaore/sdk.gaore.com/public; diff --git a/services/php53/Dockerfile b/services/php53/Dockerfile index 4dbe068..f740641 100644 --- a/services/php53/Dockerfile +++ b/services/php53/Dockerfile @@ -5,14 +5,23 @@ ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL +# 替换源列表，更新软件包索引 +RUN echo "deb http://archive.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list && \ + echo "deb-src http://archive.debian.org/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb-src http://archive.debian.org/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list && \ + apt-get update + +RUN apt-get install -y --allow-unauthenticated --no-install-recommends libyaml-dev + COPY ./docker-php-ext-enable /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-php-ext-enable COPY ./extensions /tmp/extensions WORKDIR /tmp/extensions RUN chmod +x install.sh \ - && sh install.sh \ - && rm -fr /tmp/extensions + && sh install.sh # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN usermod -u 1000 www-data && groupmod -g 1000 www-data diff --git a/services/php53/extensions/install.sh b/services/php53/extensions/install.sh index 8f5d61a..22c134c 100644 --- a/services/php53/extensions/install.sh +++ b/services/php53/extensions/install.sh @@ -305,7 +305,7 @@ fi if [ -z "${EXTENSIONS##*,yaml,*}" ]; then echo "---------- Install yaml ----------" - apt-get -y install libyaml-dev + #apt-get -y install libyaml-dev installExtensionFromTgz yaml-1.2.0 fi