Solved bugs occuring during setup of yourls

2025-08-29 15:06:26 +02:00 · 2024-01-03 15:46:28 +01:00
parent 9c81a48f17
commit ce053a0b58
32 changed files with 52 additions and 41 deletions
--- a/roles/docker-yourls/meta/main.yml
+++ b/roles/docker-yourls/meta/main.yml
@@ -1,2 +0,0 @@
-dependencies:
- docker-compose
--- a/roles/docker-yourls/tasks/main.yml
+++ b/roles/docker-yourls/tasks/main.yml
@@ -2,6 +2,10 @@
 - name: include docker vars
  include_vars: vars/docker-database-service.yml.j2

+- name: load docker compose dependencies
+  include_role:
+    name: docker-compose
+
 - name: create central database
  include_role:
    name: docker-{{database_type}}
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '3'

 services:

-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}

  application:
    logging: