Compare commits

..

2 Commits

Author SHA1 Message Date
15e142ddc4 Activated redis 2023-12-28 19:44:28 +01:00
dab853e730 Added some parameters 2023-12-28 18:30:31 +01:00
3 changed files with 14 additions and 6 deletions

View File

@ -19,9 +19,11 @@ services:
nginx['listen_port'] = 80 nginx['listen_port'] = 80
nginx['listen_https'] = false nginx['listen_https'] = false
#redis['enable'] = false gitlab_rails['initial_root_password'] = "{{gitlab_initial_root_password}}"
#gitlab_rails['redis_host'] = 'redis'
#gitlab_rails['redis_port'] = '6379' redis['enable'] = false
gitlab_rails['redis_host'] = 'redis'
gitlab_rails['redis_port'] = '6379'
ports: ports:
- "127.0.0.1:{{http_port}}:80" - "127.0.0.1:{{http_port}}:80"
- "{{ssh_port}}:22" - "{{ssh_port}}:22"
@ -30,12 +32,18 @@ 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
redis:
{% include 'templates/docker-postgres-service.yml.j2' %} {% include 'templates/docker-postgres-service.yml.j2' %}
{% include 'templates/docker-redis-service.yml.j2' %}
volumes: volumes:
database: database:
config: config:
logs: logs:
data: data:
# redis: redis:

View File

@ -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) }}"

View File

@ -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