From b3fdd4a0dfb7db88199f8342d68cde4d526bb6a9 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sat, 10 Feb 2024 15:30:32 +0100
Subject: [PATCH] composer/plugin/docker4drupal#68 Add support for invoice
ninja
---
src/Handler.php | 2 ++
templates/docker-compose.yml.twig | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index d358f4b..869ef4a 100644
--- a/src/Handler.php
+++ b/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',
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 32b18aa..6faa1de 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -642,7 +642,7 @@ services:
volumes:
- '/etc/timezone:/etc/timezone:ro'
- '/etc/localtime:/etc/localtime:ro'
- - '{{ projectrootfiles }}/in/db:/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'
@@ -677,8 +677,8 @@ services:
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:
@@ -690,7 +690,7 @@ services:
- '/etc/timezone:/etc/timezone:ro'
- '/etc/localtime:/etc/localtime:ro'
- '{{ projectroot }}/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro'
- - '{{ projectrootfiles }}/in/app/public:/var/www/app/public:ro'
+ - '{{ projectrootinvoiceninja }}/public:/var/www/app/public:ro'
labels:
traefik.enable: 'true'
traefik.docker.network: traefik-public
--
GitLab