mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-09 22:41:03 +01:00
Added some parameters
This commit is contained in:
parent
2b19cd8f97
commit
44d92ddccc
@ -19,6 +19,8 @@ services:
|
|||||||
nginx['listen_port'] = 80
|
nginx['listen_port'] = 80
|
||||||
nginx['listen_https'] = false
|
nginx['listen_https'] = false
|
||||||
|
|
||||||
|
gitlab_rails['initial_root_password'] = "{{gitlab_initial_root_password}}"
|
||||||
|
|
||||||
#redis['enable'] = false
|
#redis['enable'] = false
|
||||||
#gitlab_rails['redis_host'] = 'redis'
|
#gitlab_rails['redis_host'] = 'redis'
|
||||||
#gitlab_rails['redis_port'] = '6379'
|
#gitlab_rails['redis_port'] = '6379'
|
||||||
@ -30,6 +32,9 @@ services:
|
|||||||
- 'logs:/var/log/gitlab'
|
- 'logs:/var/log/gitlab'
|
||||||
- 'data:/var/opt/gitlab'
|
- 'data:/var/opt/gitlab'
|
||||||
shm_size: '256m'
|
shm_size: '256m'
|
||||||
|
depends_on:
|
||||||
|
database:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
{% include 'templates/docker-postgres-service.yml.j2' %}
|
{% include 'templates/docker-postgres-service.yml.j2' %}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
docker_compose_instance_directory: "{{path_docker_compose_instances}}gitlab/"
|
docker_compose_instance_directory: "{{path_docker_compose_instances}}gitlab/"
|
||||||
database_instance: "gitlab"
|
database_instance: "gitlab"
|
||||||
database_host: "database"
|
database_host: "database"
|
||||||
database_databasename: "gitlabhq_production"
|
database_databasename: "gitlab"
|
||||||
database_username: "gitlab"
|
database_username: "gitlab"
|
||||||
database_password: "{{gitlab_database_password}}"
|
database_password: "{{gitlab_database_password}}"
|
||||||
database_version: "{{ gitlab_database_version | default(postgres_default_version) }}"
|
database_version: "{{ gitlab_database_version | default(postgres_default_version) }}"
|
@ -7,7 +7,7 @@
|
|||||||
- POSTGRES_DB={{database_databasename}}
|
- POSTGRES_DB={{database_databasename}}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U {{database_username}}"]
|
test: ["CMD-SHELL", "pg_isready -U {{database_databasename}}"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 6
|
retries: 6
|
||||||
|
Loading…
Reference in New Issue
Block a user