feat(dockerfile): 新增jenkins-gitlab联合启动的Compose文件，更新卷的命名

Document-Collection · Jan 2, 2020 · f281e65 · f281e65
1 parent 1c7f16b
commit f281e65
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/dockerfiles/gitlab/docker-compose.yml b/dockerfiles/gitlab/docker-compose.yml
@@ -1,6 +1,8 @@
 version: "3.7"
 services: 
-    jenkins:
+    gitlab:
+        labels:
+            AUTHOR: "zhujian <zjzstu@github.com>"
         container_name: gitlab
         image: gitlab/gitlab-ce:latest
         volumes: 

diff --git a/dockerfiles/jenkins-gitlab/docker-compose.yml b/dockerfiles/jenkins-gitlab/docker-compose.yml
@@ -0,0 +1,33 @@
+version: "3.7"
+services: 
+    jenkins:
+        labels:
+            AUTHOR: "zhujian <zjzstu@github.com>"
+        container_name: jenkins
+        image: jenkins/jenkins
+        volumes: 
+            - "jenkins_home:/var/jenkins_home"
+        ports: 
+            - "7070:8080"
+            - "50000:50000"
+        restart: always
+        tty: true
+        stdin_open: true
+    gitlab:
+        labels:
+            AUTHOR: "zhujian <zjzstu@github.com>"
+        container_name: gitlab
+        image: gitlab/gitlab-ce:latest
+        volumes: 
+            - "/srv/gitlab/config:/etc/gitlab"
+            - "/srv/gitlab/logs:/var/log/gitlab"
+            - "/srv/gitlab/data:/var/opt/gitlab"
+        ports: 
+            - "7010:7010"
+            - "7020:22"
+        restart: always
+        tty: true
+        stdin_open: true
+volumes: 
+    jenkins_home:
+        external: true
diff --git a/dockerfiles/jenkins/docker-compose.yml b/dockerfiles/jenkins/docker-compose.yml
@@ -1,15 +1,18 @@
 version: "3.7"
 services: 
     jenkins:
+        labels:
+            AUTHOR: "zhujian <zjzstu@github.com>"
         container_name: jenkins
         image: jenkins/jenkins
         volumes: 
-            - "home:/var/jenkins_home"
+            - "jenkins_home:/var/jenkins_home"
         ports: 
             - "7070:8080"
             - "50000:50000"
         restart: always
         tty: true
         stdin_open: true
 volumes: 
-    home:
+    jenkins_home:
+        external: true
diff --git a/dockerfiles/ubuntu/docker-compose.yml b/dockerfiles/ubuntu/docker-compose.yml
@@ -1,6 +1,8 @@
 version: "3.7"
 services: 
     ubuntu:
+        labels:
+            AUTHOR: "zhujian <zjzstu@github.com>"
         container_name: ubuntu
         image: 'zjzstu/ubuntu:latest'
         build: .
@@ -9,8 +11,4 @@ services:
             - QT_IM_MODULE="fcitx"
             - GTK_IM_MODULE="fcitx"
         tty: true
-        stdin_open: true
-        volumes: 
-            - "home:/var/uhome"
-volumes: 
-    home:
+        stdin_open: true