From 501f0111c061738850dc336900eb6eb51be49982 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 10 Apr 2023 22:47:13 +0300
Subject: maybe deal better with caching causing CI_* vars to lag

---
 .docker/app/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile
index 36eabad..a419dec 100644
--- a/.docker/app/Dockerfile
+++ b/.docker/app/Dockerfile
@@ -20,6 +20,12 @@ 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}
 
@@ -32,12 +38,6 @@ 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