From ec978bf234ef5470214feaed33b99c0665a4388d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sun, 24 Apr 2022 15:35:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20gitea=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gitea/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index aa3107a..00584df 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: server: - image: gitea/gitea:1.16.5-rootless + image: gitea/gitea:1.16.6-rootless restart: always volumes: - ./data:/var/lib/gitea -- Gitee From 36daac3c8a857d1ed14b5948d3dc3f5a43d6060f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 26 Apr 2022 09:52:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gitea/docker-compose.yml | 8 +++++++- jenkins/docker-compose.yml | 11 ++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 00584df..18d7e49 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -11,4 +11,10 @@ services: - /etc/localtime:/etc/localtime:ro ports: - "35000:35000" - - "20000:20000" \ No newline at end of file + - "20000:20000" + networks: + - default + - jenkinsnetwork +networks: + jenkinsnetwork: + external: true \ No newline at end of file diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml index 9b57c19..f274cdc 100644 --- a/jenkins/docker-compose.yml +++ b/jenkins/docker-compose.yml @@ -10,8 +10,8 @@ services: user: root # network_mode: "host" ports: - - 8080:8080 - - 8050:5000 + - 35001:8080 + - 35002:5000 volumes: # 持久化jenkins数据 - ./data/jenkins_home:/var/jenkins_home @@ -23,4 +23,9 @@ services: environment: # 指定容器运行所属时区 TZ: Asia/Shanghai - + networks: + - default + - jenkinsnetwork +networks: + jenkinsnetwork: + external: true -- Gitee From 7ae18d77ac38e6fbaf1a24e38df4c066ae5ee431 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 26 Apr 2022 09:53:08 +0800 Subject: [PATCH 3/6] readme.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 318a4a4..046aa54 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,8 @@ ### 端口表 gitea 35000 -jenkins 35001 \ No newline at end of file +jenkins3.8 35001 +jenkins 35001 + +### 内部共享网络 +- docker network create -d bridge jenkinsnetwork -- Gitee From 518d663b82337f8102d5a37f9f72833dc1c5bc51 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Jun 2022 17:21:41 +0800 Subject: [PATCH 4/6] sameersbn --- sameersbn/docker-compose.yml | 15 +++++++++++++++ sameersbn/readme.md | 1 + 2 files changed, 16 insertions(+) create mode 100644 sameersbn/docker-compose.yml create mode 100644 sameersbn/readme.md diff --git a/sameersbn/docker-compose.yml b/sameersbn/docker-compose.yml new file mode 100644 index 0000000..6da7c32 --- /dev/null +++ b/sameersbn/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2' + +services: + bind: + restart: always + image: sameersbn/bind:latest + ports: + - "53:53/udp" + - "53:53/tcp" + - "10000:10000/tcp" + volumes: + - ./:/data + environment: + # root账号密码 + ROOT_PASSWORD: admin \ No newline at end of file diff --git a/sameersbn/readme.md b/sameersbn/readme.md new file mode 100644 index 0000000..a311ffb --- /dev/null +++ b/sameersbn/readme.md @@ -0,0 +1 @@ +## DNS 服务器 \ No newline at end of file -- Gitee From 481392cebf4668257b15cf5b67babc28e67abac6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 20 Jul 2022 10:10:33 +0800 Subject: [PATCH 5/6] update version --- gitea/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 18d7e49..8c0c169 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: server: - image: gitea/gitea:1.16.6-rootless + image: gitea/gitea:1.16.9-rootless restart: always volumes: - ./data:/var/lib/gitea -- Gitee From 89b3274926f3eda643745428e9e7b20e07420b9e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Aug 2022 18:39:34 +0800 Subject: [PATCH 6/6] update version --- gitea/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 8c0c169..d5fb079 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: server: - image: gitea/gitea:1.16.9-rootless + image: gitea/gitea:1.17.0-rootless restart: always volumes: - ./data:/var/lib/gitea -- Gitee