From 974caf185cfb8b0f165a098f0c4ebc553777f9e4 Mon Sep 17 00:00:00 2001
From: feng0207 <1647919872@qq.com>
Date: Tue, 11 Aug 2026 22:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/php/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 2768a5a..1621da7 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,6 +1,8 @@
 ARG PHP_BASE_IMAGE=php:7.4-cli
 ARG COMPOSER_IMAGE=composer:latest
 
+FROM ${COMPOSER_IMAGE} AS composer
+
 FROM ${PHP_BASE_IMAGE}
 
 RUN set -eux; \
@@ -22,7 +24,7 @@ RUN set -eux; \
     docker-php-ext-enable swoole; \
     rm -rf /var/lib/apt/lists/* /tmp/pear
 
-COPY --from=${COMPOSER_IMAGE} /usr/bin/composer /usr/bin/composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 # Composer 阿里云镜像（备用，vendor 已提交通常不需要）
 RUN composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
@@ -31,7 +33,7 @@ WORKDIR /var/www/html
 
 COPY swoole.php /tmp/swoole_docker.php
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN sed -i 's/\r$//' /usr/local/bin/entrypoint.sh && chmod +x /usr/local/bin/entrypoint.sh
 
 EXPOSE 20108