From 1eb3630cc0e39d52a0a4ed1ae6aaa3224fc72f92 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Thu, 28 Dec 2023 12:33:48 +0100
Subject: [PATCH] Added correct parameters

---
 roles/docker-gitlab/README.md                 |  5 +++-
 .../templates/docker-compose.yml.j2           | 29 ++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/roles/docker-gitlab/README.md b/roles/docker-gitlab/README.md
index 2bf6bd04..2227ca48 100644
--- a/roles/docker-gitlab/README.md
+++ b/roles/docker-gitlab/README.md
@@ -32,4 +32,7 @@ Variables are defined in `vars/main.yml`. Key variables include:
 ## Usage
 Include this role in your Ansible playbooks and specify the necessary variables. Run the playbook to deploy and configure GitLab in a Docker environment.
 
-For a detailed walkthrough and explanation of this role, refer to the conversation at [ChatGPT Session Transcript](https://chat.openai.com/share/1b0147bf-d4de-4790-b8ed-c332aa4e3ce3).
\ No newline at end of file
+For a detailed walkthrough and explanation of this role, refer to the conversation at [ChatGPT Session Transcript](https://chat.openai.com/share/1b0147bf-d4de-4790-b8ed-c332aa4e3ce3).
+
+## Further Information
+- https://ralph.blog.imixs.com/2019/06/09/running-gitlab-on-docker/
diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2
index af18907c..2755c3f4 100644
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -7,16 +7,21 @@ services:
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://{{domain}}'
-        postgresql['enable'] = false
+        postgresql['enable']                  = false
         gitlab_rails['gitlab_shell_ssh_port'] = {{ssh_port}}
-        gitlab_rails['db_adapter'] = 'postgresql'
-        gitlab_rails['db_encoding'] = 'utf8'
-        gitlab_rails['db_host'] = '{{database_host}}'
-        gitlab_rails['db_port'] = 5432
-        gitlab_rails['db_username'] = '{{database_username}}'
-        gitlab_rails['db_password'] = '{{database_password}}'
-    ports:
-      - '8929:8929'
+        gitlab_rails['db_adapter']            = 'postgresql'
+        gitlab_rails['db_encoding']           = 'utf8'
+        gitlab_rails['db_host']               = '{{database_host}}'
+        gitlab_rails['db_port']               = 5432
+        gitlab_rails['db_username']           = '{{database_username}}'
+        gitlab_rails['db_password']           = '{{database_password}}'
+        gitlab_rails['db_database']           = "{{database_databasename}}"
+        nginx['listen_port']                  = 80
+        nginx['listen_https']                 = false
+
+        #redis['enable']                       = false
+        #gitlab_rails['redis_host']            = 'redis'
+        #gitlab_rails['redis_port']            = '6379'
     ports:
       - "127.0.0.1:{{http_port}}:80"
       - "{{ssh_port}}:22"
@@ -29,4 +34,8 @@ services:
 {% include 'templates/docker-postgres-service.yml.j2' %}
 
 volumes:
-  database:
\ No newline at end of file
+  database:
+  config:
+  logs:
+  data:
+  # redis:
\ No newline at end of file