diff --git a/webserver/docker_gitlab/tasks/main.yml b/webserver/docker_gitlab/tasks/main.yml index 394da55896efcb88e20c04c167fd69bb1db67620..bf177e75754dce513d5a69657b4cf68f2f40c5af 100644 --- a/webserver/docker_gitlab/tasks/main.yml +++ b/webserver/docker_gitlab/tasks/main.yml @@ -44,25 +44,12 @@ src: "gitlab.rb" dest: "/srv/gitlab/conf/gitlab.rb" +- name: Konfig-Datei Gitlab + template: + src: "docker-compose.yml" + dest: "/srv/gitlab/docker-compose.yml" -# Docker Container erstellen und starten -# Mittels Expose muss der Port 8065 zusätzlich zur verwendung freigegeben werden - -- name: start docker image - docker: - name: gitlab - image: gitlab/gitlab-ce:9.4.5-ce.0 - state: reloaded - restart_policy: always - ports: - - 0.0.0.0:444:22 - - 127.0.0.1:42001:80 - - 127.0.0.1:8065:8065 - expose: - - 8065 - volumes: - - /srv/gitlab/conf:/etc/gitlab - - /srv/gitlab/log:/var/log/gitlab - - /srv/gitlab/data:/var/opt/gitlab - links: - - ldap-service:ldap +- name: start gitlab docker + docker_service: + project_src: /srv/gitlab/ + state: present diff --git a/webserver/docker_gitlab/templates/docker-compose.yml b/webserver/docker_gitlab/templates/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..fdcd446d0553b67050494d8041cdae115fd2422f --- /dev/null +++ b/webserver/docker_gitlab/templates/docker-compose.yml @@ -0,0 +1,16 @@ + +version: "3" + +services: + + app: + + image: gitlab/gitlab-ce:9.4.5-ce.0 + restart: always + ports: + - 0.0.0.0:444:22 + - 127.0.0.1:42001:80 + volumes: + - /srv/gitlab/conf:/etc/gitlab + - /srv/gitlab/log:/var/log/gitlab + - /srv/gitlab/data:/var/opt/gitlab diff --git a/webserver/docker_gitlab/templates/gitlab.rb b/webserver/docker_gitlab/templates/gitlab.rb index c74c1844d6400cf9112fed2110dc463f51cd3294..2cb8d83ce1e220398aa1b27898cc360fdeb53569 100644 --- a/webserver/docker_gitlab/templates/gitlab.rb +++ b/webserver/docker_gitlab/templates/gitlab.rb @@ -92,7 +92,7 @@ gitlab_rails['gitlab_default_projects_features_issues'] = false ldap_servers_template = <<-'EOS' main: label: 'LDAP' - host: '%s' + host: '10.0.20.2' port: 389 uid: 'uid' method: 'plain'