From 81b21f5d7ff159c2ea7a2c74375602a6fa5156ed Mon Sep 17 00:00:00 2001
From: Philipp Lang <privat@zoomyboy.de>
Date: Thu, 20 Jul 2023 20:28:19 +0200
Subject: [PATCH] Fetch remove images

---
 .app.env.example       |  7 +++++--
 .docker/php.Dockerfile |  2 +-
 .drone.yml             |  2 +-
 docker-compose.yml     | 27 ++++++---------------------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/.app.env.example b/.app.env.example
index 24789f31..6d46d5e4 100644
--- a/.app.env.example
+++ b/.app.env.example
@@ -1,7 +1,7 @@
 APP_NAME="Adrema"
-APP_ENV=local
+APP_ENV=production
 APP_KEY=YOUR_APP_KEY
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://localhost:8000
 APP_MODE=stamm
 
@@ -13,3 +13,6 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME=me
+
+DB_PASSWORD=secret_db_password
+MYSQL_PASSWORD=secret_db_password
diff --git a/.docker/php.Dockerfile b/.docker/php.Dockerfile
index 3676079a..3e5241f5 100644
--- a/.docker/php.Dockerfile
+++ b/.docker/php.Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /app
 RUN apt-get update
 RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip
 RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra
-RUN docker-php-ext-install pdo_mysql curl gd intl mbstring pcntl
+RUN docker-php-ext-install pdo_mysql curl gd exif intl mbstring pcntl
 RUN pecl install redis && docker-php-ext-enable redis
 COPY --chown=www-data:www-data . /app
 COPY --chown=www-data:www-data --from=node /app/public /app/public
diff --git a/.drone.yml b/.drone.yml
index d5ba9729..7e198040 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,7 +32,7 @@ steps:
           - apt-get update > /dev/null
           - apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip > /dev/null
           - apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra > /dev/null
-          - docker-php-ext-install pdo_mysql curl gd intl mbstring pcntl > /dev/null
+          - docker-php-ext-install pdo_mysql curl gd exif intl mbstring pcntl > /dev/null
           - pecl install redis && docker-php-ext-enable redis > /dev/null
           - php artisan migrate
           - php artisan test
diff --git a/docker-compose.yml b/docker-compose.yml
index 39b3205c..de67ad8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,29 @@
 version: '3'
 services:
     webservice:
-        build:
-            context: .
-            dockerfile: ./.docker/nginx.Dockerfile
-        image: nginx:1.21.6-alpine
-        container_name: nginx
+        image: zoomyboy/adrema-webservice:latest
         depends_on:
             - php
         ports:
             - '8000:80'
-        volumes:
-            - ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
 
     php:
-        build:
-            context: .
-            dockerfile: ./.docker/php.Dockerfile
-        container_name: php
+        image: zoomyboy/adrema-app:latest
         depends_on:
             - db
-        command: php-fpm -F -R
         env_file:
             - .app.env
         environment:
             DB_HOST: db
             DB_DATABASE: db
             DB_USERNAME: db
-            DB_PASSWORD: secret
             QUEUE_CONNECTION: redis
             XELATEX_BIN: /usr/bin/xelatex
             PDFLATEX_BIN: /usr/bin/pdflatex
             REDIS_HOST: redis
 
     horizon:
-        build:
-            context: .
-            dockerfile: ./.docker/php.Dockerfile
-        container_name: horizon
+        image: zoomyboy/adrema-app:latest
         depends_on:
             - db
             - php
@@ -48,7 +34,6 @@ services:
             DB_HOST: db
             DB_DATABASE: db
             DB_USERNAME: db
-            DB_PASSWORD: secret
             QUEUE_CONNECTION: redis
             XELATEX_BIN: /usr/bin/xelatex
             PDFLATEX_BIN: /usr/bin/pdflatex
@@ -56,10 +41,10 @@ services:
 
     db:
         image: mariadb:10.6.5
-        container_name: db
+        env_file:
+            - .app.env
         environment:
-            MARIADB_ROOT_PASSWORD: secret_root_password
-            MYSQL_PASSWORD: secret
+            MARIADB_RANDOM_ROOT_PASSWORD: yes
             MYSQL_DATABASE: db
             MYSQL_USER: db
         volumes: