diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index b7625a2..8acc732 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -4,13 +4,16 @@ services: web: image: 'gitlab/gitlab-ce:latest' container_name: gitlab - restart: always + restart: unless-stopped network_mode: bridge environment: + TZ: "Europe/Bratislava" GITLAB_OMNIBUS_CONFIG: | external_url 'https://gitlab.sectorq.eu' nginx['listen_port'] = 80 nginx['listen_https'] = false + web_server['username'] = 'git' + gitlab_rails['time_zone'] = 'Europe/Bratislava' gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] gitlab_rails['omniauth_sync_email_from_provider'] = 'saml' @@ -24,8 +27,8 @@ services: name: 'saml', args: { assertion_consumer_service_url: 'https://gitlab.sectorq.eu/users/auth/saml/callback', - # Shown when navigating to certificates in authentik - idp_cert_fingerprint: '1b:af:1e:f8:3f:b1:57:e6:b0:62:f6:59:25:48:1e:9c:c3:9b:36:9e', + # Shown when navigating to certificates in authentik1 + idp_cert_fingerprint: 'f7:fd:49:03:b3:38:52:b3:23:f5:43:c4:8d:08:65:32:e0:5a:7b:0e', idp_sso_target_url: 'https://auth.sectorq.eu/application/saml/gitlab/sso/binding/redirect/', issuer: 'https://gitlab.sectorq.eu', name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent', @@ -38,28 +41,7 @@ services: label: 'authentik' } ] - # gitlab_rails['ldap_enabled'] = true - # gitlab_rails['ldap_servers'] = { - # 'main' => { - # 'label' => 'LDAP', - # 'host' => '192.168.77.106', - # 'port' => 1389, - # 'uid' => 'sAMAccountName', - # 'base' => 'dc=sectorq,dc=eu' - # 'bind_dn' => 'CN=admin,DC=sectorq,DC=eu', - # 'password' => '$LDAP_ADMIN_PASSWORD', - # 'encryption' => 'plain', - # 'verify_certificates' => false, - # 'timeout' => 10, - # 'active_directory' => false, - # 'user_filter' => '(memberOf=cn=gitlab,ou=group,dc=sectorq,dc=eu)', - # 'base' => 'ou=people,dc=sectorq,dc=eu', - # 'lowercase_usernames' => 'false', - # 'retry_empty_result_with_codes' => [80], - # 'allow_username_or_email_login' => false, - # 'block_auto_created_users' => false - # } - # } + hostname: 'gitlab.sectorq.eu' ports: @@ -70,7 +52,19 @@ services: - '/share/docker_data/gitlab/config:/etc/gitlab' - '/share/docker_data/gitlab/logs:/var/log/gitlab' - '/share/docker_data/gitlab/data:/var/opt/gitlab' - - shm_size: '2gb' + - '/etc/localtime:/etc/localtime:ro' + shm_size: '4gb' labels: - com.centurylinklabs.watchtower.enable: true \ No newline at end of file + - com.centurylinklabs.watchtower.enable=true + - homepage.group=Infrastructure + - homepage.name=Gitlab + - homepage.weight=1 + - homepage.icon=gitlab.png + - homepage.href=https://gitlab.sectorq.eu + - homepage.description=Version control + - homepage.server=my-docker + - homepage.container=gitlab + - homepage.widget.type=gitlab + - homepage.widget.url=https://gitlab.sectorq.eu + - homepage.widget.key=glpat-BuMKcaDqeD-Wx3dW4TM9 + - homepage.widget.user_id=2 \ No newline at end of file