2018-02-05 补充 docker gitlab

judasn · judasn · commit dc1e7e496d98 · 2018-02-05T23:45:18.000+08:00
diff --git a/Gitlab-Install-And-Settings.md b/Gitlab-Install-And-Settings.md
@@ -1,5 +1,51 @@
 # Gitlab 安装和配置
 
+
+## Docker 安装方式
+
+
+- 创建宿主机挂载目录：`mkdir -p /data/gitlab/gitlab /data/gitlab/redis /data/gitlab/postgresql`
+- 这里使用 docker-compose 的启动方式，所以需要创建 docker-compose.yml 文件：
+
+```yml
+gitlab:
+  image: sameersbn/gitlab
+  ports:
+    - "10022:22"
+    - "10080:80"
+  links:
+    - gitlab-redis:redisio
+    - gitlab-postgresql:postgresql
+  environment:
+    - GITLAB_PORT=80
+    - GITLAB_SSH_PORT=22
+    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string
+    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string
+    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string
+  volumes:
+    - /data/gitlab/gitlab:/home/git/data
+  restart: always
+gitlab-redis:
+  image: sameersbn/redis
+  volumes:
+    - /data/gitlab/redis:/var/lib/redis
+  restart: always
+gitlab-postgresql:
+  image: sameersbn/postgresql:9.5-3
+  environment:
+    - DB_NAME=gitlabhq_production
+    - DB_USER=gitlab
+    - DB_PASS=123456
+    - DB_EXTENSION=pg_trgm
+  volumes:
+    - /data/gitlab/postgresql:/var/lib/postgresql
+  restart: always
+```
+
+- 启动：`docker-compose up -d`
+- 浏览器访问：<http://192.168.0.105:10080>
+
+
 ## 本文前提
 
 - 本文只讲解 Gitlab 的搭建配置相关，至于开发流程本质跟 Github 没啥区别的，所以读这篇文章建议最好是已经会了 Github 那种开发流程。
@@ -149,4 +195,5 @@
 - <http://blog.smallmuou.xyz/git/2016/03/11/%E5%85%B3%E4%BA%8EGitlab%E8%8B%A5%E5%B9%B2%E6%9D%83%E9%99%90%E9%97%AE%E9%A2%98.html>
 - <https://zhangmengpl.gitbooks.io/gitlab-guide/content/whatisgitflow.html>
 - <https://blog.coderstory.cn/2017/02/01/gitlab/>
-- <https://xuanwo.org/2016/04/13/gitlab-install-intro/>
+- <https://xuanwo.org/2016/04/13/gitlab-install-intro/>
+- <https://softlns.github.io/2016/11/14/jenkins-gitlab-docker/>
diff --git a/Jenkins-Install-And-Settings.md b/Jenkins-Install-And-Settings.md
@@ -52,6 +52,7 @@ Can not write to /var/jenkins_home/copy_reference_file.log. Wrong volume permiss
 	- Git plugin
 	- GitLab Plugin
 	- SSH Slaves plugin
+	- Maven Integration plugin
 	- Matrix Authorization Strategy Plugin
 	- PAM Authentication plugin
 	- LDAP Plugin
@@ -70,6 +71,7 @@ Can not write to /var/jenkins_home/copy_reference_file.log. Wrong volume permiss
 	- GitHub plugin Github与Jenkins集成
 	- GIT client plugin Git客户端插件
 	- Maven Integration plugin：用于构建 Maven 项目
+	- Gradle Plugin：用于构建 Gradle 项目
 	- Gitlab Hook Plugin：用于触发 GitLab 的一些 WebHooks 来构建项目
 	- FireLine Plugin：代码规范检查，已经集成了阿里巴巴的代码规约（P3C）检查
 	- Gitlab Authentication 这个插件提供了使用GitLab进行用户认证和授权的方案
