roles/docker-gitlab/templates/docker-compose.yml.j2

@@ -19,11 +19,9 @@ services:
         nginx['listen_port']                  = 80
         nginx['listen_https']                 = false
 
-        gitlab_rails['initial_root_password'] = "{{gitlab_initial_root_password}}"
-        
-        redis['enable']                       = false
-        gitlab_rails['redis_host']            = 'redis'
-        gitlab_rails['redis_port']            = '6379'
+        #redis['enable']                       = false
+        #gitlab_rails['redis_host']            = 'redis'
+        #gitlab_rails['redis_port']            = '6379'
     ports:
       - "127.0.0.1:{{http_port}}:80"
       - "{{ssh_port}}:22"
@@ -32,18 +30,12 @@ services:
       - 'logs:/var/log/gitlab'
       - 'data:/var/opt/gitlab'
     shm_size: '256m'
-    depends_on:
-      database:
-        condition: service_healthy
-      redis:
 
 {% include 'templates/docker-postgres-service.yml.j2' %}
 
-{% include 'templates/docker-redis-service.yml.j2' %}
-
 volumes:
   database:
   config:
   logs:
   data:
-  redis:
+  # redis:

roles/docker-gitlab/vars/main.yml

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

templates/docker-postgres-service.yml.j2

@@ -7,7 +7,7 @@
       - POSTGRES_DB={{database_databasename}}
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U {{database_databasename}}"]
+      test: ["CMD-SHELL", "pg_isready -U {{database_username}}"]
       interval: 10s
       timeout: 5s
       retries: 6