diff --git a/README.md b/README.md index a019be0fcc03a07dbf11c625f73e1bc4e5f48bef..e7b646a7081effcba849cae87ea279c76ceac1a3 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,6 @@ To enable the Git hook that makes use of this service, a running GitLab instance 1. Access the GitLab server shell, and create a folder at `/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/` if it doesn't already exist. This folder will contain all of the servers global Git hooks for pre-receive events. These hooks trigger when a user attempts to push information to the server. 1. In the host machine, copy the ECA script to the newly created folder. If using a docker container, this can be done with a call similar to the following: -`docker cp src/main/rb/eca.rb gitlab.eca_web_1:/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/` +`docker cp src/main/rb/eca.rb git-eca-rest-api-web-1:/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/` 1. In the GitLab shell once again, ensure that the newly copied script matches the folders ownership, and that the file permissions are `755`. This allows the server to properly run the hook when needed. diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ff2a86ee65f384916b63296e7c225010481574a..1253221aa1df7a037ea7702c237bbef296e654df 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,16 +1,24 @@ -web: - image: 'gitlab/gitlab-ce:latest' - restart: always - environment: - VIRTUAL_HOST: "gitlab.dev.docker" - VIRTUAL_PORT: 443 - VIRTUAL_PROTO: https - CERT_NAME: dev.docker - ports: - - 443 - - 80 - - 22 - volumes: - - '/localdocker/gitlab/config:/etc/gitlab' - - '/localdocker/gitlab/logs:/var/log/gitlab' - - '/localdocker/gitlab/data:/var/opt/gitlab' +version: '3.6' +services: + + web: + image: 'gitlab/gitlab-ce:latest' + restart: always + hostname: gitlab.dev.docker + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'http://gitlab.dev.docker' + ports: + - '443:443' + - '80:80' + - '22:22' + shm_size: '256m' + volumes: + - '/localdocker/gitlab/config:/etc/gitlab' + - '/localdocker/gitlab/logs:/var/log/gitlab' + - '/localdocker/gitlab/data:/var/opt/gitlab' + deploy: + restart_policy: + condition: on-failure + max_attempts: 5 +