Merge remote-tracking branch 'origin/master'

buehler-tmp/.env

@@ -0,0 +1,60 @@
+APP_NAME=Buehler
+APP_ENV=production
+APP_KEY=base64:HJOLniGgGgDek5igunMWhPo2xjPqgkBoPUEvnP78KMY=
+APP_DEBUG=false
+APP_URL=https://buehler-kaffee.de
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=buehler-db
+DB_PORT=3306
+DB_DATABASE=buehler
+DB_USERNAME=buehler
+DB_PASSWORD=hZp2796o4ks7boFyQX2ZU8EVoijbFVJQ
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+

buehler-tmp/docker-compose.yaml

@@ -8,17 +8,19 @@ networks:
 volumes:
   buehler-db:
   buehler-storage:
+    name: buehler-storage
 
 services:
   buehler:
-    image: cs-git.ddnss.de/buehler/laravel-tmp:latest
+    image: cs-git.ddnss.de/buehler/laravel:latest
     container_name: buehler-app
     restart: always
     links:
       - db
     working_dir: /var/www
     volumes:
-      - buehler-storage:/var/www/storage
+      - ./.env:/var/www/.env
+      - buehler-storage:/var/www/storage/app/public
     networks:
       - proxy
       - buehler

rist-startup/docker-compose.yaml

@@ -37,6 +37,7 @@ services:
       MYSQL_PASSWORD: WL5U6tnGYRm3t5iS2294PHVY4C55KuEL
       MYSQL_USER: startup
       MYSQL_DATABASE: startup
+    command: ['--sql-mode=']
 
 networks:
   startup:
@@ -44,4 +45,4 @@ networks:
     external: true
 
 volumes:
-  startup-db:
+  startup-db:

svj/docker-compose.yaml

@@ -43,7 +43,6 @@ services:
     image: mysql:8
     container_name: svj-db
     hostname: svj-db
-    command: --default-authentication-plugin=mysql_native_password
     restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: paE76zrCZfhA6Fbx1MUM
@@ -52,6 +51,7 @@ services:
       MYSQL_DATABASE: svj
     volumes:
       - svj-db:/var/lib/mysql
+    command: ['--sql-mode=', '--default-authentication-plugin=mysql_native_password']
     networks:
       - svj
     healthcheck: