From 8717b244e9c2f1a402c6edb838e99855ddc8f108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?=
Date: Thu, 18 Jul 2024 10:39:09 +0200
Subject: [PATCH] tweak(scripts/dockercompose): make db service optional
---
scripts/ansible/roles/tinedockercompose/defaults/main.yml | 2 ++
.../roles/tinedockercompose/templates/docker-compose.yml.j2 | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/ansible/roles/tinedockercompose/defaults/main.yml b/scripts/ansible/roles/tinedockercompose/defaults/main.yml
index d9419372605..105ea382e76 100644
--- a/scripts/ansible/roles/tinedockercompose/defaults/main.yml
+++ b/scripts/ansible/roles/tinedockercompose/defaults/main.yml
@@ -17,6 +17,8 @@ tinedockercompose_ports: "80:80"
tinedockercompose_auto_installupdate: false
tinedockercompose_addtineuser: true
+tinedockercompose_db_service: true
+tinedockercompose_db_host: "db"
tinedockercompose_db_image: "mariadb:10.6"
tinedockercompose_db_command: "--max-allowed-packet=209715210"
tinedockercompose_db_path: "/srv/tine/db"
diff --git a/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2 b/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2
index 795e40b3d63..3097da7ee2f 100644
--- a/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2
+++ b/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2
@@ -1,5 +1,6 @@
version: '2'
services:
+{% if tinedockercompose_db_service is defined and tinedockercompose_db_service|bool %}
db:
image: {{ tinedockercompose_db_image }}
command: {{ tinedockercompose_db_command }}
@@ -16,6 +17,7 @@ services:
networks:
- internal_network
+{% endif %}
web:
image: {{ tinedockercompose_tine_image }}
restart: always
@@ -23,7 +25,7 @@ services:
- db
- cache
environment:
- TINE20_DATABASE_HOST: db
+ TINE20_DATABASE_HOST: {{ tinedockercompose_db_host }}
TINE20_DATABASE_DBNAME: *MYSQL_DATABASE
TINE20_DATABASE_USERNAME: *MYSQL_USER
TINE20_DATABASE_PASSWORD: *MYSQL_PASSWORD