Refactored docker rroles dto use new role docker-compose

roles/docker-gitlab/README.md

@@ -16,7 +16,7 @@ This Ansible role is designed for setting up and managing a GitLab server runnin
 ## Role Variables
 Variables are defined in `vars/main.yml`. Key variables include:
 - `docker_compose_instance_directory`: Directory for Docker Compose instances.
-- `database_instance`, `database_host`, `database_databasename`, `database_username`, `database_password`: Database configuration variables.
+- `docker_compose_project_name`, `database_host`, `database_databasename`, `database_username`, `database_password`: Database configuration variables.
 - `database_version`: PostgreSQL version, with a default fallback.
 
 ## Handlers

roles/docker-gitlab/handlers/main.yml

@@ -1,8 +0,0 @@
----
-- name: recreate gitlab
-  command:
-    cmd: docker-compose -p gitlab up -d --force-recreate
-    chdir: "{{docker_compose_instance_directory}}"
-  environment:
-    COMPOSE_HTTP_TIMEOUT: 600
-    DOCKER_CLIENT_TIMEOUT: 600

roles/docker-gitlab/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- nginx-docker-reverse-proxy
+- docker-compose

roles/docker-gitlab/tasks/main.yml

@@ -10,4 +10,4 @@
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
-  notify: recreate gitlab
+  notify: docker compose project setup

roles/docker-gitlab/vars/main.yml

@@ -1,7 +1,7 @@
-docker_compose_instance_directory:  "{{path_docker_compose_instances}}gitlab/"
-database_instance:                  "gitlab"
+docker_compose_project_name:        "gitlab"
+docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
 database_host:                      "database"
-database_databasename:              "gitlab"
-database_username:                  "gitlab"
+database_databasename:              "{{docker_compose_project_name}}"
+database_username:                  "{{docker_compose_project_name}}"
 database_password:                  "{{gitlab_database_password}}"
 database_version:                   "{{ gitlab_database_version | default(postgres_default_version) }}"