mod seeder

.docker/base.Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3.11-fpm as php
+FROM php:8.3.11-fpm AS php
 WORKDIR /app
 RUN ls /app
 RUN apt-get update

.docker/nginx.Dockerfile

@@ -1,16 +1,17 @@
-FROM composer:2.7.9 as composer
+FROM composer:2.7.9 AS composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
 RUN php artisan telescope:publish
 RUN php artisan horizon:publish
 
-FROM node:20.15.0-slim as node
+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
+FROM nginx:1.21.6-alpine AS nginx
 WORKDIR /app
 COPY --from=node /app /app
 COPY --from=composer /app/public/vendor /app/public/vendor

.docker/php.Dockerfile

@@ -1,14 +1,15 @@
-FROM composer:2.7.9 as composer
+FROM composer:2.7.9 AS composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
 
-FROM node:20.15.0-slim as node
+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
+FROM zoomyboy/adrema-base:latest AS php
 COPY --chown=www-data:www-data . /app
 COPY --chown=www-data:www-data --from=node /app/public /app/public
 COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor

.docker/php/entrypoint

@@ -28,7 +28,7 @@ fi
 if [ $1 == "app" ]; then
     # --------------------------- ensure appkey is set ----------------------------
     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 && php artisan db:seed )
+    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'
     php artisan scout:sync-index-settings
     php-fpm -F -R -O

README.md

@@ -100,28 +100,22 @@ Bei dem Setup wird im Daten-Verzeichniss ein Ordner `./data/setup` angelegt. Hie
     git clone https://git.zoomyboy.de/silva/adrema.git
     ```
 
-2. Kopieren der Beispiel Docker-Compose für das Entwickeln und nach Wünschen anpassen
-
-    ```cmd
-    cp docker-compose.dev.yml docker-compose.yml
-    ```
-
-3. Kopieren der Beispiel Environmentvariablen-Datei
+2. Kopieren der Beispiel Environmentvariablen-Datei
 
     ```cmd
     cp .app.env.example .app.env
     ```
 
-4. Submodule aktuallisieren
+3. Submodule aktuallisieren
 
     ```cmd
     git submodule update --init
     ```
 
-5. Container erstellen
+4. Container erstellen
 
     ```cmd
     docker compose build
     ```
 
-6. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
+5. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren