Check for APP_KEY in every PHP Container

.docker/nginx.Dockerfile

@@ -8,7 +8,8 @@ RUN php artisan horizon:publish
 FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
-RUN npm install && npm run prod && npm run img && rm -R node_modules
+RUN cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
+RUN npm ci && npm run prod && npm run img && rm -R node_modules
 
 FROM nginx:1.21.6-alpine as nginx
 WORKDIR /app

.docker/php.Dockerfile

@@ -6,7 +6,8 @@ RUN composer install --ignore-platform-reqs --no-dev
 FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
-RUN npm install && npm run prod && npm run img && rm -R node_modules
+RUN cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
+RUN npm ci && npm run prod && npm run img && rm -R node_modules
 
 FROM zoomyboy/adrema-base:latest as php
 COPY --chown=www-data:www-data . /app

.docker/php/entrypoint

@@ -15,6 +15,11 @@ mkdir -p /app/storage/app/public || true
 chown -R www-data:www-data /app/packages/laravel-nami/.cookies
 chown -R www-data:www-data /app/storage/app
 
+if [ $APP_KEY = "YOUR_APP_KEY" ]; then
+    echo "----------------------- Keinen APP KEY gefunden. Key wird generiert:    $(su www-data -c 'php artisan key:generate --show')   ----------------------- Füge diesen Key als APP_KEY ein ---------------------"
+    exit 1
+fi
+
 if [ $1 == "horizon" ]; then
     wait_for_db
     su www-data -c 'php artisan horizon'
@@ -22,10 +27,6 @@ fi
 
 if [ $1 == "app" ]; then
     # --------------------------- ensure appkey is set ----------------------------
-    if [ $APP_KEY = "YOUR_APP_KEY" ]; then
-        echo "----------------------- Keinen APP KEY gefunden. Key wird generiert:    $(su www-data -c 'php artisan key:generate --show')   ----------------------- Füge diesen Key als APP_KEY ein ---------------------"
-        exit 1
-    fi
     wait_for_db
     php -r '$connection = new PDO("mysql:host='$DB_HOST';dbname='$DB_DATABASE'", "'$DB_USERNAME'", "'$DB_PASSWORD'"); $connection->query("DESCRIBE migrations");' > /dev/null || php artisan migrate --seed --force
     su www-data -c 'php artisan migrate --force'

.drone.yml

@@ -34,7 +34,7 @@ steps:
     - name: node
       image: node:20.15.0-slim
       commands:
-          - npm ci && cd packages/adrema-form && npm ci && npm run build && cd ../../ && npm run img && npm run prod && rm -R node_modules
+          - npm ci && cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../ && npm run img && npm run prod && rm -R node_modules
 
     - name: tests
       image: zoomyboy/adrema-base:latest

docker-compose.yml

@@ -34,7 +34,6 @@ services:
             - ./data/storage:/app/storage/app
             - ./data/plugins:/app/plugins
             - ./data/cookies:/app/packages/laravel-nami/.cookies
-            - ./data/invoice:/app/resources/views/tex/invoice
 
     horizon:
         build:
@@ -57,7 +56,6 @@ services:
             - ./data/storage:/app/storage/app
             - ./data/plugins:/app/plugins
             - ./data/cookies:/app/packages/laravel-nami/.cookies
-            - ./data/invoice:/app/resources/views/tex/invoice
 
     schedule:
         build:
@@ -80,7 +78,6 @@ services:
             - ./data/storage:/app/storage/app
             - ./data/plugins:/app/plugins
             - ./data/cookies:/app/packages/laravel-nami/.cookies
-            - ./data/invoice:/app/resources/views/tex/invoice
 
     db:
         image: mariadb:10.6.5

resources/views/tex/templates/invoice

@@ -1 +0,0 @@
-../../../../packages/silvaletter/template