diff --git a/gitlab/README.md b/gitlab/README.md index 4edc807..28957d6 100644 --- a/gitlab/README.md +++ b/gitlab/README.md @@ -1,15 +1,27 @@ gitlab ====== +[GitLab][1] includes Git repository management, code reviews, issue tracking, +wikis, and more, plus GitLab CI, an easy-to-use continuous integration and +deployment tool. + ## docker-compose.yml ``` gitlab: image: gitlab/gitlab-ce + hostname: gitlab.example.com + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://gitlab.example.com' ports: - "22:22" - "80:80" - "443:443" + volumes: + - ./gitlab/config:/etc/gitlab + - ./gitlab/logs:/var/log/gitlab + - ./gitlab/data:/var/opt/gitlab restart: always ``` @@ -19,16 +31,12 @@ gitlab: $ vi /etc/ssh/sshd_config - Port 22 + Port 2222 + $ systemctl restart ssh $ docker-compose up -d -$ docker-compose exec gitlab bash ->>> vi /etc/gitlab/gitlab.rb -+ external_url 'http://your-domain-name' ->>> gitlab-ctl reconfigure ->>> exit -$ firefox http://your-domain-name +$ firefox https://gitlab.example.com ``` ## backup volumes @@ -42,3 +50,9 @@ $ docker run --rm \ $ tar tzf gitlab.tgz ``` + +## read more + +- http://docs.gitlab.com/omnibus/docker/ + +[1]: https://gitlab.com/ diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml index f72dac2..10c174c 100644 --- a/gitlab/docker-compose.yml +++ b/gitlab/docker-compose.yml @@ -1,12 +1,15 @@ gitlab: image: gitlab/gitlab-ce + hostname: gitlab.example.com + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://gitlab.example.com' ports: - - "8443:443" - - "8080:80" - - "2222:22" + - "22:22" + - "80:80" + - "443:443" volumes: - - /srv/gitlab/config:/etc/gitlab - - /srv/gitlab/logs:/var/log/gitlab - - /srv/gitlab/data:/var/opt/gitlab - privileged: true + - ./gitlab/config:/etc/gitlab + - ./gitlab/logs:/var/log/gitlab + - ./gitlab/data:/var/opt/gitlab restart: always diff --git a/phpvirtualbox/README.md b/phpvirtualbox/README.md index 579eb99..fc78359 100644 --- a/phpvirtualbox/README.md +++ b/phpvirtualbox/README.md @@ -21,7 +21,7 @@ phpvirtualbox: > - Make sure you can login `remote-server` with `username:password`. > - ISO images can be placed at `/data` directory of `remote-server`. -> - During the OS installation, you can connect it with RDC program. +> - During the OS installation, you can connect to it with RDP viewer. ### vboxweb.service