更新目前使用的部分镜像

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.yml]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

bind/Dockerfile

@@ -0,0 +1,4 @@
+FROM resystit/bind9
+
+
+

bind/docker-compose.yml

@@ -1,13 +1,21 @@
-bind:
+version: '2'
-    image: sameersbn/bind:latest
+services:
-    container_name: bind
+    bind:
-    dns: 127.0.0.1
+        image: registry.cn-hangzhou.aliyuncs.com/kennylee/bind:9.16.1-20200524
-    environment:
+        container_name: bind
-        - ROOT_PASSWORD=8aso2QQUDTpz
+        dns: 127.0.0.1
-        - TZ=Asia/Shanghai
+        environment:
-    ports:
+            - ROOT_PASSWORD=8aso2QQUDTpz
-        - 10000:10000
+            - TZ=Asia/Shanghai
-        - 53:53/udp
+        ports:
-    volumes:
+            - 10000:10000
-        - /srv/docker/bind:/data
+            - 53:53
-    restart: always
+            - 53:53/udp
+        volumes:
+            - ./data/bind:/data
+        restart: on-failure
+        logging:
+            driver: 'json-file'
+            options:
+                max-size: '30m'
+                max-file: '1'

gitlab/README.md

@@ -6,9 +6,25 @@
 2. 执行 _env.sh_ 脚本，生成docker-compose的配置文件(`.env`文件)。
 3. 执行 `docker-compose up -d` 命令，启动容器。
 
-依赖应用参考:
+### 外部PostgreSQL
 
-[PostgreSQL versions](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html)
+> 注：目前仅支持使用PostgreSQL数据库
+
+官方不建议使用外部数据库，而实际上使用外部数据库时也会遇到不少问题，免于不必要的时间花费吧。
+
+* [PostgreSQL versions](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html)
+* [Database settings](https://docs.gitlab.com/13.7/omnibus/settings/database.html#gitlab-137-and-later)
+* [External PostgreSQL database](https://docs.gitlab.com/13.7/charts/advanced/external-db/index.html)
+
+创建gitlab数据库
+
+```
+CREATE DATABASE gitlabhq_production;
+```
+
+### 外部nginx
+
+* [NGINX settings](https://docs.gitlab.com/omnibus/settings/nginx.html)
 
 ## 注意事项
 
@@ -18,8 +34,9 @@
 
 ## 文档参考
 
+* [GitLab Docker images](https://docs.gitlab.com/13.7/omnibus/docker/README.html)
+* [Configuring Omnibus GitLab](https://docs.gitlab.com/omnibus/settings/README.html)
 * [gitlab官方dockerfile](https://hub.docker.com/r/gitlab/gitlab-ce/~/dockerfile/)
 * [git官方帮助文档](https://about.gitlab.com/getting-help/)
-* [GitLab Docker images](https://docs.gitlab.com/13.7/omnibus/docker/README.html)
 
 

gitlab/docker-compose.env

@@ -7,12 +7,6 @@ GITLAB_DATA_PATH=./data/gitlab/data
 GITLAB_LOGS_PATH=./data/gitlab/logs
 GITLAB_CONFIG_PATH=./data/gitlab/config
 
-POSTGRESQL_IMAGE=registry.cn-hangzhou.aliyuncs.com/kennylee/postgresql
-POSTGRESQL_DATA=./data/postgresql
-POSTGRESQL_USER=gitlab
-POSTGRESQL_PASSWORD=gitlab
-POSTGRESQL_DB=gitlabhq_production
-
 REDIS_IMAGE=registry.cn-hangzhou.aliyuncs.com/kennylee/redis:3.2-alpine
 REDIS_DATA=./data/redis/
 

gitlab/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2'
 
 networks:
     &network net:
@@ -7,25 +7,6 @@ networks:
             driver: default
                 
 services:
-    postgresql:
-        image: ${POSTGRESQL_IMAGE}
-        container_name: gitlab_db
-        restart: always
-        expose:
-            - '5432'
-        environment:
-            - POSTGRES_USER=${POSTGRESQL_USER}
-            - POSTGRES_PASSWORD=${POSTGRESQL_PASSWORD}
-            - POSTGRES_DB=${POSTGRESQL_DB}
-        volumes:
-            - ${POSTGRESQL_DATA}:/var/lib/postgresql/data:rw
-        networks:
-            - *network
-        logging:
-            driver: 'json-file'
-            options:
-                max-size: '30m'
-                max-file: '1'
     redis:
         image: ${REDIS_IMAGE}
         restart: always
@@ -77,7 +58,6 @@ services:
                 max-size: '30m'
                 max-file: '2'
         depends_on:
-            - postgresql
             - redis
 
 

jenkins/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2.4'
 services:
     app:
         image: registry.cn-hangzhou.aliyuncs.com/kennylee/jenkins:2.164.3
-        ports: 
+        ports:
             - 8080:8080
             - 50000:50000
         container_name: jenkins

mysql/docker-compose.yml

@@ -1,10 +1,10 @@
 version: '3'
-    
+
 services:
     app:
         image: registry.cn-hangzhou.aliyuncs.com/kennylee/mysql
         #build: ./
-        ports: 
+        ports:
             - 3306:3306
         container_name: mysql
         restart: on-failure
@@ -13,8 +13,8 @@ services:
         volumes:
             - ./data/standalong:/var/lib/mysql/:z
             - ./conf/:/etc/mysql/mysql-my.conf.d/:z
-            - ./data/standalong-logs:/var/log/mysql/:z            
+            - ./data/standalong-logs:/var/log/mysql/:z
-        command: ["--max_connections=300"]
+        command: [ "--max_connections=300" ]
         logging:
             driver: 'json-file'
             options:

nexus3/Dockerfile

@@ -1,4 +1,3 @@
-# 3.28.1
 FROM sonatype/nexus3
 
 

nexus3/docker-compose.yml

@@ -1,12 +1,17 @@
 version: '2'
 services:
-    app:
+  app:
-        image: registry.cn-hangzhou.aliyuncs.com/kennylee/nexus3:3.28.1
+    image: registry.cn-hangzhou.aliyuncs.com/kennylee/nexus3:3.29.2
-        ports: 
+    ports:
-            - 8081:8081
+      - 8081:8081
-        container_name: nexus3
+    container_name: nexus3
-        restart: on-failure
+    restart: on-failure
-        environment:
+    environment:
-            - TZ=Asia/Shanghai
+      - TZ=Asia/Shanghai
-        volumes:
+    volumes:
-            - ./data/:/nexus-data/:z
+      - ./data/:/nexus-data/:z
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '30m'
+        max-file: '1'

postgresql/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   postgresql:
-    image: 'registry.cn-hangzhou.aliyuncs.com/kennylee/postgresql:10.7'
+    image: 'registry.cn-hangzhou.aliyuncs.com/kennylee/postgresql:12.4'
     container_name: "postgresql"
     ports:
       - '5432:5432'