From 9bb23a01f1b22cd414263833c4eb2823dd2976f0 Mon Sep 17 00:00:00 2001
From: Thomas <info@thomas-peterson.de>
Date: Thu, 27 Feb 2025 12:03:33 +0100
Subject: [PATCH] Fixes

---
 .../docker-compose.local.ci.prod.yml              | 13 -------------
 .docker/docker-compose/docker-compose.local.yml   |  1 -
 .docker/images/nginx/Dockerfile                   |  2 +-
 .docker/images/php/application/Dockerfile         | 15 +++------------
 .docker/images/php/cron/Dockerfile                |  2 +-
 .docker/images/php/fpm/Dockerfile                 |  3 +++
 6 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/.docker/docker-compose/docker-compose.local.ci.prod.yml b/.docker/docker-compose/docker-compose.local.ci.prod.yml
index 1d651f2e8..1011c0152 100644
--- a/.docker/docker-compose/docker-compose.local.ci.prod.yml
+++ b/.docker/docker-compose/docker-compose.local.ci.prod.yml
@@ -1,15 +1,2 @@
 version: '3.7'
 
-services:
-  application:
-    image: ${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/application-${ENV?}:${TAG?}
-    build:
-      context: ../
-      #      platforms:
-      #  - "linux/amd64"
-        #        - "linux/arm64"
-      dockerfile: ./images/php/application/Dockerfile
-      target: ${ENV?}
-      args:
-        - BASE_IMAGE=${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/php-base-${ENV?}:${TAG?}
-        - ENV=${ENV?}
diff --git a/.docker/docker-compose/docker-compose.local.yml b/.docker/docker-compose/docker-compose.local.yml
index 1f1c6d76c..77f2dee67 100644
--- a/.docker/docker-compose/docker-compose.local.yml
+++ b/.docker/docker-compose/docker-compose.local.yml
@@ -98,7 +98,6 @@ services:
         - BASE_IMAGE=${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/php-base-${ENV?}:${TAG?}
         - APP_SSH_PASSWORD=${APP_SSH_PASSWORD?}
         - ENV=${ENV?}
-        - APP_ENV=${APP_ENV}
     environment:
       - PHP_IDE_CONFIG=${PHP_IDE_CONFIG?}
     # cap_add and security_opt are required to enable strace
diff --git a/.docker/images/nginx/Dockerfile b/.docker/images/nginx/Dockerfile
index 99f9580fa..123dc11b6 100644
--- a/.docker/images/nginx/Dockerfile
+++ b/.docker/images/nginx/Dockerfile
@@ -17,4 +17,4 @@ FROM base as prod
 
 FROM base as local
 
-
+FROM base as ci
diff --git a/.docker/images/php/application/Dockerfile b/.docker/images/php/application/Dockerfile
index 8e7cd1a8b..1241b82be 100644
--- a/.docker/images/php/application/Dockerfile
+++ b/.docker/images/php/application/Dockerfile
@@ -13,17 +13,8 @@ FROM base as ci
 USER $APP_USER_NAME
 
 run apt update && apt install chromium-driver
+
 FROM base as local
 
-#ARG APP_SSH_PASSWORD
-#RUN echo "$APP_USER_NAME:$APP_SSH_PASSWORD" | chpasswd 2>&1
-#
-## Required to start sshd, otherwise the container will error out on startup with the message
-## "sshd: no hostkeys available -- exiting."
-## @see https://stackoverflow.com/a/65348102/413531
-#RUN ssh-keygen -A
-#
-## we use SSH deployment configuration in PhpStorm for local development
-#EXPOSE 22
-#
-#CMD ["/usr/sbin/sshd", "-D"]
+FROM base as ci
+
diff --git a/.docker/images/php/cron/Dockerfile b/.docker/images/php/cron/Dockerfile
index e4b2b5756..bf8be24b3 100644
--- a/.docker/images/php/cron/Dockerfile
+++ b/.docker/images/php/cron/Dockerfile
@@ -17,7 +17,7 @@ CMD ["/usr/bin/set-env.sh"]
 
 FROM base as ci
 
-USER $APP_USER_NAME
+CMD ["/usr/bin/set-env.sh"]
 
 FROM base as local
 
diff --git a/.docker/images/php/fpm/Dockerfile b/.docker/images/php/fpm/Dockerfile
index 2cc04d036..5e666b2b0 100644
--- a/.docker/images/php/fpm/Dockerfile
+++ b/.docker/images/php/fpm/Dockerfile
@@ -19,4 +19,7 @@ CMD ["php-fpm", "-F"]
 FROM base as prod
 
 COPY ./images/php/fpm/conf.d/zz-app-prod.ini $PHP_INI_DIR/conf.d/
+
 FROM base as local
+
+FROM base as ci