diff --git a/README.md b/README.md index 318a4a4955c41dd802f9e0d263ce495a40492d39..046aa547aea7705d77b018658088473f0b08268e 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 diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index aa3107ae2cdfe4fc3216c788c18472cc82bb59c2..d5fb079e56f4bbcd307184f4432a47fb583e5d0b 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.17.0-rootless restart: always volumes: - ./data:/var/lib/gitea @@ -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 9b57c19eff82053ce64fa306cc59888e3d26ac33..f274cdc61503ed95d78d6952cfdf88cfd39d1257 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 diff --git a/sameersbn/docker-compose.yml b/sameersbn/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..6da7c32f084eb4b9fa15a1ff31fe62dda4b89685 --- /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 0000000000000000000000000000000000000000..a311ffb09dcc22bafef4cca873246ff3ffae45b5 --- /dev/null +++ b/sameersbn/readme.md @@ -0,0 +1 @@ +## DNS 服务器 \ No newline at end of file