diff --git a/blueprints/gitlab-ce/docker-compose.yml b/blueprints/gitlab-ce/docker-compose.yml index 3100a148..8e6c0734 100644 --- a/blueprints/gitlab-ce/docker-compose.yml +++ b/blueprints/gitlab-ce/docker-compose.yml @@ -1,65 +1,24 @@ services: gitlab: - image: gitlab/gitlab-ce:latest + image: gitlab/gitlab-ce:19.1.2-ce.0 restart: unless-stopped - hostname: gitlab.example.com + shm_size: "256m" environment: GITLAB_OMNIBUS_CONFIG: | external_url 'http://${GITLAB_HOST}' - gitlab_rails['gitlab_ssh_host'] = '${GITLAB_HOST}' - gitlab_rails['gitlab_shell_ssh_port'] = 2224 - gitlab_rails['db_adapter'] = 'postgresql' - gitlab_rails['db_host'] = 'postgresql' - gitlab_rails['db_port'] = '5432' - gitlab_rails['db_database'] = '${POSTGRES_DB}' - gitlab_rails['db_username'] = '${POSTGRES_USER}' - gitlab_rails['db_password'] = '${POSTGRES_PASSWORD}' - # Redis config for external TCP connection - gitlab_rails['redis_url'] = 'redis://redis:6379/0' - gitlab_rails['redis_host'] = 'redis' - gitlab_rails['redis_port'] = 6379 - gitlab_rails['redis_socket'] = nil - gitlab_rails['gitlab_email_enabled'] = false - gitlab_rails['gitlab_default_can_create_group'] = true - gitlab_rails['gitlab_username_changing_enabled'] = false - unicorn['worker_processes'] = 2 - unicorn['worker_timeout'] = 60 - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = true nginx['listen_port'] = 80 nginx['listen_https'] = false + gitlab_rails['initial_root_password'] = '${GITLAB_ROOT_PASSWORD}' + gitlab_rails['gitlab_email_enabled'] = false + puma['worker_processes'] = 0 + sidekiq['concurrency'] = 10 prometheus_monitoring['enable'] = false - ports: - - "80" - - "2224" volumes: - gitlab_config:/etc/gitlab - gitlab_logs:/var/log/gitlab - gitlab_data:/var/opt/gitlab - depends_on: - - postgresql - - redis - - postgresql: - image: postgres:16-alpine - restart: unless-stopped - environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - volumes: - - postgresql_data:/var/lib/postgresql/data - - redis: - image: redis:7-alpine - restart: unless-stopped - volumes: - - redis_data:/data volumes: gitlab_config: gitlab_logs: gitlab_data: - postgresql_data: - redis_data: diff --git a/blueprints/gitlab-ce/meta.json b/blueprints/gitlab-ce/meta.json index 8092fbd9..4ca3e959 100644 --- a/blueprints/gitlab-ce/meta.json +++ b/blueprints/gitlab-ce/meta.json @@ -1,7 +1,7 @@ { "id": "gitlab-ce", "name": "GitLab CE", - "version": "latest", + "version": "19.1.2", "description": "GitLab Community Edition is a free and open source platform for managing Git repositories, CI/CD pipelines, and project management.", "logo": "gitlab-ce.svg", "links": { diff --git a/blueprints/gitlab-ce/template.toml b/blueprints/gitlab-ce/template.toml index 1bc24e87..d531d80d 100644 --- a/blueprints/gitlab-ce/template.toml +++ b/blueprints/gitlab-ce/template.toml @@ -1,15 +1,11 @@ [variables] main_domain = "${domain}" -postgres_db = "gitlab" -postgres_user = "gitlab" -postgres_password = "${password:32}" +gitlab_root_password = "${password:32}" [config] env = [ "GITLAB_HOST=${main_domain}", - "POSTGRES_DB=${postgres_db}", - "POSTGRES_USER=${postgres_user}", - "POSTGRES_PASSWORD=${postgres_password}", + "GITLAB_ROOT_PASSWORD=${gitlab_root_password}", ] [[config.domains]]