Merge branch 'development' into '913-resultloader-needs-to-be-fixed'

Development

See merge request !1493

.env.example

@@ -4,6 +4,9 @@ APP_LOG_LEVEL=debug
 APP_KEY=
 APP_URL=http://localhost
 
+REDIS_RESULT_CONNECTION=default
+REDIS_RESULT_CACHE_DURATION=60
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file

build.sh

-#!/bin/bash
-
-set -e
-# Pfad zum neu geklonten Repo
-path=`pwd`
-cd ~/
-if [ -d MetaGer_neu ]; then rm -rf MetaGer_neu;fi
-git clone "$path" MetaGer_neu
-cd MetaGer_neu
-composer install
-cp $ENVFILE .env
-sed -i -e "s/APP_ENV=production/APP_ENV=$STAGE/g" .env
-cp $SUMAS config/sumas.json
-cp $SUMASEN config/sumasEn.json
-scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/
-scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/
-scp -P 63824 metager@metager3.de:~/adBlacklistUrl.txt config/
-scp -P 63824 metager@metager3.de:~/adBlacklistDomains.txt config/
-scp -P 63824 metager@metager3.de:~/spam.txt config/
-scp -P 63824 metager@metager3.de:~/UsersSeeder.php database/seeds/
-touch storage/logs/laravel.log
-touch storage/logs/worker.log
-touch database/metager.sqlite
-touch database/useragents.sqlite
-chmod 777 config/sumas.json config/sumas.json database/metager.sqlite database/useragents.sqlite
-chmod -R 777 storage
-chmod -R 777 bootstrap/cache
-npm install
-npm run production
-php artisan requests:gather
-if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
-cd ~/
-while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
-mv MetaGer_neu MetaGer
-sudo pkill --signal SIGHUP supervisord
-php ~/MetaGer/artisan up
\ No newline at end of file

docker-compose.yml

+version: '3.7'
+services:
+  phpdeps:
+    image: prooph/composer:7.3
+    volumes:
+      - .:/app
+    command: install
+  assets:
+    image: node:10
+    volumes:
+      - .:/usr/src/app
+    working_dir: /usr/src/app
+    command: bash -c "npm install && npm run watch"
+  dependencies:
+    image: alpine:latest
+    volumes:
+      - .:/data
+    working_dir: /data
+    command: /data/init.sh
+  web:
+    depends_on:
+      - "dependencies"
+      - "phpdeps"
+      - "assets"
+    restart: on-failure
+    build: .
+    working_dir: /html
+    volumes:
+      - .:/html
+    ports: 
+    - "8080:80"

init.sh

+#!/bin/sh
+
+if [ ! -f "/data/.env" ]; then
+    cp /data/.env.example /data/.env
+fi
+
+if [ -f "/data/database/useragents.sqlite" ]; then
+    rm /data/database/useragents.sqlite
+fi
+cp /data/database/useragents.sqlite.example /data/database/useragents.sqlite
+
+chmod -R go+w storage bootstrap/cache
\ No newline at end of file

start-dev.sh

-#!/bin/sh
-docker build . -t metager && docker run -p 8000:8000/tcp metager;