From a72807a9b1c4d6b6688b86abd4b7b71feaea3ca0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 10 Apr 2023 22:53:24 +0300 Subject: Revert "maybe deal better with caching causing CI_* vars to lag" This reverts commit 501f0111c061738850dc336900eb6eb51be49982. --- .docker/app/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index a419dec..36eabad 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -20,12 +20,6 @@ RUN apk add --no-cache php81 php81-fpm \ /etc/php81/php-fpm.d/www.conf && \ mkdir -p /var/www ${SCRIPT_ROOT}/config.d -ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} -ADD index.php ${SCRIPT_ROOT} -ADD config.docker.php ${SCRIPT_ROOT} - -COPY --from=app-src . ${SRC_DIR} - ARG CI_COMMIT_BRANCH ENV CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH} @@ -38,6 +32,12 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} +ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} +ADD index.php ${SCRIPT_ROOT} +ADD config.docker.php ${SCRIPT_ROOT} + +COPY --from=app-src . ${SRC_DIR} + ENV PHP_WORKER_MAX_CHILDREN=5 ENV PHP_WORKER_MEMORY_LIMIT=256M -- cgit v1.2.3