Merge branch 'develop' into 'main'

Merging develop into main

See merge request !83

src/Handler.php

@@ -252,6 +252,7 @@ class Handler extends BaseHandler {
     }
     $this->config->setValue('projectroot', $projectRoot, FALSE);
     $this->config->setValue('projectrootfiles', $projectRoot, FALSE);
+    $this->config->setValue('projectrootinvoiceninja', $projectRoot, FALSE);
     $this->config->setValue('projectdomain', str_replace('_', '-', $this->config->readValue('projectname')) . '.' . $traefik['domain'], FALSE);
     $this->config->setValue('projectprotocol', 'http' . ($traefik['usessl'] ? 's' : ''), FALSE);
     $this->config->setValue('socketprotocol', 'ws' . ($traefik['usessl'] ? 's' : ''), FALSE);
@@ -365,6 +366,7 @@ class Handler extends BaseHandler {
           'projectrootdb' => $root . '/db',
           'projectrootfiles' => $root . '/files',
           'projectrootredis' => $root . '/redis',
+          'projectrootinvoiceninja' => $root . '/in',
           'projectname' => getenv('PROJECT_NAME') . '_' . getenv('CI_COMMIT_REF_SLUG'),
           'projectdomain' => str_replace('_', '-', $this->config->readValue('domain') ?? ''),
           'projectprotocol' => 'https',
@@ -643,7 +645,7 @@ class Handler extends BaseHandler {
         'dest' => $projectRoot . '/tests',
       ],
       'in-vhost.conf' => [
-        'dest' => $projectRoot . '/config',
+        'dest' => $projectRoot . '/nginx',
         'condition' => $this->config->readValue(['invoiceninja', 'enable']),
       ],
     ];

templates/docker-compose.yml.twig

@@ -639,31 +639,6 @@ services:
   in-db:
     image: 'mysql:5'
     environment:
-      - APP_ENV=production
-      - 'APP_URL=https://invoice-{{ projectdomain }}'
-      - 'APP_KEY={{ invoiceninja.api_key }}'
-      - APP_DEBUG=false
-      - REQUIRE_HTTPS=false
-      - PHANTOMJS_PDF_GENERATION=false
-      - PDF_GENERATOR=snappdf
-      - QUEUE_CONNECTION=database
-      - 'TRUSTED_PROXIES=*'
-      - IS_DOCKER=true
-      - DB_HOST=in-db
-      - DB_PORT=3306
-      - DB_DATABASE=ninja
-      - DB_USERNAME=ninja
-      - DB_PASSWORD=ninja
-      - IN_USER_EMAIL={{ invoiceninja.admin_name }}
-      - IN_PASSWORD={{ invoiceninja.admin_pass }}
-      - MAIL_MAILER=smtp
-      - MAIL_HOST={{ invoiceninja.mail.host }}
-      - MAIL_PORT={{ invoiceninja.mail.port }}
-      - MAIL_USERNAME={{ invoiceninja.mail.user }}
-      - 'MAIL_PASSWORD={{ invoiceninja.mail.pass }}'
-      - MAIL_ENCRYPTION={{ invoiceninja.mail.security }}
-      - MAIL_FROM_ADDRESS={{ invoiceninja.mail.user }}
-      - "MAIL_FROM_NAME='{{ invoiceninja.mail.fromname }}'"
       - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
       - MYSQL_USER=ninja
       - MYSQL_PASSWORD=ninja
@@ -671,7 +646,7 @@ services:
     volumes:
       - '/etc/timezone:/etc/timezone:ro'
       - '/etc/localtime:/etc/localtime:ro'
-      - '{{ projectrootfiles }}/in/mysql/data:/var/lib/mysql:rw,delegated'
+      - '{{ projectrootinvoiceninja }}/db:/var/lib/mysql:rw,delegated'
   in-app:
     # After first startup, call "sudo chown -R 1500:1500 app" and start again.
     image: 'invoiceninja/invoiceninja:5'
@@ -703,15 +678,11 @@ services:
       - MAIL_ENCRYPTION={{ invoiceninja.mail.security }}
       - MAIL_FROM_ADDRESS={{ invoiceninja.mail.user }}
       - "MAIL_FROM_NAME='{{ invoiceninja.mail.fromname }}'"
-      - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
-      - MYSQL_USER=ninja
-      - MYSQL_PASSWORD=ninja
-      - MYSQL_DATABASE=ninja
     volumes:
       - '/etc/timezone:/etc/timezone:ro'
       - '/etc/localtime:/etc/localtime:ro'
-      - '{{ projectrootfiles }}/in/app/public:/var/www/app/public:rw,delegated'
-      - '{{ projectrootfiles }}/in/app/storage:/var/www/app/storage:rw,delegated'
+      - '{{ projectrootinvoiceninja }}/public:/var/www/app/public:rw,delegated'
+      - '{{ projectrootinvoiceninja }}/storage:/var/www/app/storage:rw,delegated'
   in-web:
     image: nginx
     networks:
@@ -722,8 +693,8 @@ services:
     volumes:
       - '/etc/timezone:/etc/timezone:ro'
       - '/etc/localtime:/etc/localtime:ro'
-      - '{{ projectroot }}/config/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro'
-      - '{{ projectrootfiles }}/in/app/public:/var/www/app/public:ro'
+      - '{{ projectroot }}/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro'
+      - '{{ projectrootinvoiceninja }}/public:/var/www/app/public:ro'
     labels:
       traefik.enable: 'true'
       traefik.docker.network: traefik-public