Compare commits
No commits in common. "ca0dd11336eba1ab59a53d87f191ee09ceb051f9" and "dc40728fca14929d28703304b0d710a075f16b3a" have entirely different histories.
ca0dd11336
...
dc40728fca
|
@ -8,8 +8,7 @@ RUN php artisan horizon:publish
|
|||
FROM node:20.15.0-slim as node
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
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
|
||||
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||
|
||||
FROM nginx:1.21.6-alpine as nginx
|
||||
WORKDIR /app
|
||||
|
|
|
@ -6,8 +6,7 @@ RUN composer install --ignore-platform-reqs --no-dev
|
|||
FROM node:20.15.0-slim as node
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
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
|
||||
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||
|
||||
FROM zoomyboy/adrema-base:latest as php
|
||||
COPY --chown=www-data:www-data . /app
|
||||
|
|
|
@ -15,11 +15,6 @@ 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'
|
||||
|
@ -27,6 +22,10 @@ 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'
|
||||
|
|
|
@ -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 && rm -R node_modules && cd ../../ && npm run img && npm run prod && rm -R node_modules
|
||||
- npm ci && cd packages/adrema-form && npm ci && npm run build && cd ../../ && npm run img && npm run prod && rm -R node_modules
|
||||
|
||||
- name: tests
|
||||
image: zoomyboy/adrema-base:latest
|
||||
|
|
|
@ -34,6 +34,7 @@ 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:
|
||||
|
@ -56,6 +57,7 @@ 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:
|
||||
|
@ -78,6 +80,7 @@ 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
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../../../packages/silvaletter/template
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
Loading…
Reference in New Issue