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