diff --git a/docker-compose.yaml b/docker-compose.yaml index c30eb1d..be66e77 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,21 +2,19 @@ services: gitlab: image: 'gitlab/gitlab-ce:latest' restart: always - hostname: 'gitlab.nstest.local' +# hostname: 'git.nstart.local' container_name: gitlab-ce env_file: - gitlab.env ports: - '8586:8081' - - '8545:443' - - '8090:8090' - - '22:22' + - '2222:22' volumes: - - '$GITLAB_HOME/config:/etc/gitlab' - - '$GITLAB_HOME/logs:/var/log/gitlab' - - '$GITLAB_HOME/data:/var/opt/gitlab' - networks: - - gitlab + - './git-data/config:/etc/gitlab' + - './git-data/logs:/var/log/gitlab' + - './git-data/data:/var/opt/gitlab' +# networks: +# - gitlab gitlab-runner: image: gitlab/gitlab-runner:latest @@ -28,8 +26,8 @@ services: volumes: - ./runner-config:/etc/gitlab-runner - /var/run/docker.sock:/var/run/docker.sock - networks: - - gitlab +# networks: +# - gitlab -networks: - gitlab: +#networks: +# gitlab: diff --git a/gitlab.env.example b/gitlab.env.example index a3065ad..d39aab3 100644 --- a/gitlab.env.example +++ b/gitlab.env.example @@ -1,14 +1,17 @@ GITLAB_OMNIBUS_CONFIG=" - external_url = 'https://gitlab.nstest.local' + external_url 'https://git.nstart.local' nginx['listen_port'] = 8081 nginx['listen_https'] = false + gitlab_rails['gitlab_host'] = 'git.nstart.local' + gitlab_rails['gitlab_port'] = 443 + gitlab_rails['gitlab_https'] = true gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_allow_single_sign_on'] = true gitlab_rails['omniauth_auto_sing_in_with_provider'] = 'openid_connect' gitlab_rails['omniauth_block_auto_created_users'] = false gitlab_rails['omniauth_auto_link_ldap_user'] = false gitlab_rails['omniauth_auto_link_user'] = ['openid_connect'] - gitlab_rails['gitlab_ssh_host'] = 'ssh.gitlab.nstest.local' + gitlab_rails['gitlab_ssh_host'] = 'git.nstart.local' gitlab_rails['omniauth_providers'] = [{ name: 'openid_connect', label: 'Новый Старт ID', @@ -24,7 +27,7 @@ GITLAB_OMNIBUS_CONFIG=" client_options: { identifier: 'gitlab', secret: '', - redirect_uri: 'https://gitlab.nstest.local/users/auth/openid_connect/callback', + redirect_uri: 'https://git.nstart.local/users/auth/openid_connect/callback', } } }] diff --git a/runner-config/certs/git.nstart.local.crt b/runner-config/certs/git.nstart.local.crt new file mode 100644 index 0000000..9e42afc --- /dev/null +++ b/runner-config/certs/git.nstart.local.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIUIjJbBQwjttGdplafh/xeEbpQsVEwDQYJKoZIhvcNAQEL +BQAwRjEjMCEGA1UECgwa0JDQniDQndC+0LLRi9C5INCh0YLQsNGA0YIxHzAdBgNV +BAMMFnNydmt3dHMwMS5uc3RhcnQubG9jYWwwHhcNMjUwOTAyMTM0NDQzWhcNMzcx +MjE1MTM0NDQzWjBGMSMwIQYDVQQKDBrQkNCeINCd0L7QstGL0Lkg0KHRgtCw0YDR +gjEfMB0GA1UEAwwWc3J2a3d0czAxLm5zdGFydC5sb2NhbDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAPHmRc1s3oYq9VJFZ0a6iCuXI4PtZt0fnrvmtL1x +qZ2B2SefdWHMiGu7uZeN+n5hbefYxwLNG5uvoZGOObYfaHAmwNdEea6xKT15Q9+y +yaV4i4zvTvyJhb/Q2Vldpc0h62DWSMRMTYFnfXuvaRFIYtUWe0xa92zNFi5/rCA3 +F0LhxJtJBe/52UgNHFaJ8xw4do38ihoLsM93UJrt86SkDj4XtvRP5wJBTDYdMUhg +Uw1wgOjHNC5OSwnGLmvd2agI9DxfrFtts7C2m4TfpQRSEv1RBepuRRhsh2P/3edW +9paegFxZQxoSuGzl47b+bFjZ1Qa+AYDWRa2d00IwBp4FK2UCAwEAAaNTMFEwHQYD +VR0OBBYEFGxIHnoLch0XMz+Vq/OWbLSpxCVOMB8GA1UdIwQYMBaAFGxIHnoLch0X +Mz+Vq/OWbLSpxCVOMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB +AGnFpgBBnXbXw2SgYeGSrKwe2Ash66MSzNFXZEuNoIjkS64ZymvysE7S9peezVCb +u26p3DSPGVFXuXCe+trt1OnTTkOMHOYMrrWwjBkPlU/hjEUDmjhr11d/a6HfRC5i +r/44xy1/i8F7yBVRYKTrHkC1pFs1hyabFB9C4PNBJ3eAnk3s5Ikh08lRQ5nD4Eoe +5/Gz62znb09b2+/SobHRm8gufOXzd8AT9OWuyt6KgHIJ5Gc5F3tydXGDpxeWRtux +0o7O1wGEbKAVcfKvx/2NgRUmEhASXjVsjiB56BBEHxRlZpV38BTjUBPryuRiz3Ze +hneIyDjekpH7U7LogVpAkUg= +-----END CERTIFICATE----- + diff --git a/runner-config/certs/repo.nstart.local.crt b/runner-config/certs/repo.nstart.local.crt new file mode 100644 index 0000000..9e42afc --- /dev/null +++ b/runner-config/certs/repo.nstart.local.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIUIjJbBQwjttGdplafh/xeEbpQsVEwDQYJKoZIhvcNAQEL +BQAwRjEjMCEGA1UECgwa0JDQniDQndC+0LLRi9C5INCh0YLQsNGA0YIxHzAdBgNV +BAMMFnNydmt3dHMwMS5uc3RhcnQubG9jYWwwHhcNMjUwOTAyMTM0NDQzWhcNMzcx +MjE1MTM0NDQzWjBGMSMwIQYDVQQKDBrQkNCeINCd0L7QstGL0Lkg0KHRgtCw0YDR +gjEfMB0GA1UEAwwWc3J2a3d0czAxLm5zdGFydC5sb2NhbDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAPHmRc1s3oYq9VJFZ0a6iCuXI4PtZt0fnrvmtL1x +qZ2B2SefdWHMiGu7uZeN+n5hbefYxwLNG5uvoZGOObYfaHAmwNdEea6xKT15Q9+y +yaV4i4zvTvyJhb/Q2Vldpc0h62DWSMRMTYFnfXuvaRFIYtUWe0xa92zNFi5/rCA3 +F0LhxJtJBe/52UgNHFaJ8xw4do38ihoLsM93UJrt86SkDj4XtvRP5wJBTDYdMUhg +Uw1wgOjHNC5OSwnGLmvd2agI9DxfrFtts7C2m4TfpQRSEv1RBepuRRhsh2P/3edW +9paegFxZQxoSuGzl47b+bFjZ1Qa+AYDWRa2d00IwBp4FK2UCAwEAAaNTMFEwHQYD +VR0OBBYEFGxIHnoLch0XMz+Vq/OWbLSpxCVOMB8GA1UdIwQYMBaAFGxIHnoLch0X +Mz+Vq/OWbLSpxCVOMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB +AGnFpgBBnXbXw2SgYeGSrKwe2Ash66MSzNFXZEuNoIjkS64ZymvysE7S9peezVCb +u26p3DSPGVFXuXCe+trt1OnTTkOMHOYMrrWwjBkPlU/hjEUDmjhr11d/a6HfRC5i +r/44xy1/i8F7yBVRYKTrHkC1pFs1hyabFB9C4PNBJ3eAnk3s5Ikh08lRQ5nD4Eoe +5/Gz62znb09b2+/SobHRm8gufOXzd8AT9OWuyt6KgHIJ5Gc5F3tydXGDpxeWRtux +0o7O1wGEbKAVcfKvx/2NgRUmEhASXjVsjiB56BBEHxRlZpV38BTjUBPryuRiz3Ze +hneIyDjekpH7U7LogVpAkUg= +-----END CERTIFICATE----- + diff --git a/runner-config/config.toml.example b/runner-config/config.toml.example index e294da1..cfee75a 100644 --- a/runner-config/config.toml.example +++ b/runner-config/config.toml.example @@ -6,8 +6,8 @@ shutdown_timeout = 0 session_timeout = 1800 [[runners]] - name = "docker-nstest" - url = "http://gitlab-ce:8081" + name = "docker-nstart" + url = "https://git.nstart.local" id = 1 token = "" token_obtained_at = 2025-11-01T14:59:32Z @@ -25,7 +25,8 @@ shutdown_timeout = 0 disable_entrypoint_overwrite = false oom_kill_disable = false disable_cache = false - volumes = ["/home/ivan/docker/git/git-data/gitlab-runner/config/repo.nstart.local.crt:/etc/docker/certs.d/repo.nstart.local/ca.crt:ro", "/cache"] + volumes = ["/root/gitlab/git-data/gitlab-runner/config/repo.nstart.local.crt:/etc/docker/certs.d/repo.nstart.local/ca.crt:ro", "/cache"] shm_size = 0 network_mtu = 0 - extra_hosts = ["gitlab.nstest.local:192.168.103.13"] + extra_hosts = ["git.nstart.local:192.168.100.202"] +