Merge 02c3a9bf68
into c56d888dd3
This commit is contained in:
commit
c61653e2c0
1
config/master.cfg
Symbolic link
1
config/master.cfg
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../master.cfg
|
@ -14,12 +14,17 @@ services:
|
|||||||
- 8080:8080
|
- 8080:8080
|
||||||
- 9989:9989 # for external workers
|
- 9989:9989 # for external workers
|
||||||
|
|
||||||
|
config:
|
||||||
|
image: nginx
|
||||||
|
volumes:
|
||||||
|
- ./config:/usr/share/nginx/html:ro
|
||||||
|
|
||||||
buildbot:
|
buildbot:
|
||||||
image: buildbot/buildbot-master:latest
|
image: buildbot/buildbot-master:latest
|
||||||
env_file: db.env
|
env_file: db.env
|
||||||
environment:
|
environment:
|
||||||
- BUILDBOT_CONFIG_DIR=config
|
- BUILDBOT_CONFIG_DIR=config
|
||||||
- BUILDBOT_CONFIG_URL=https://github.com/buildbot/buildbot-docker-example-config/archive/master.tar.gz
|
- BUILDBOT_CONFIG_URL=http://config/master.cfg
|
||||||
- BUILDBOT_WORKER_PORT=9989
|
- BUILDBOT_WORKER_PORT=9989
|
||||||
- BUILDBOT_WEB_URL=http://localhost:8080/
|
- BUILDBOT_WEB_URL=http://localhost:8080/
|
||||||
- BUILDBOT_WEB_PORT=8080
|
- BUILDBOT_WEB_PORT=8080
|
||||||
@ -28,6 +33,7 @@ services:
|
|||||||
- BUILDBOT_MQ_REALM=realm1
|
- BUILDBOT_MQ_REALM=realm1
|
||||||
- TCP_PORTS=8080,9989
|
- TCP_PORTS=8080,9989
|
||||||
links:
|
links:
|
||||||
|
- config:config
|
||||||
- db
|
- db
|
||||||
expose:
|
expose:
|
||||||
- 8080
|
- 8080
|
||||||
|
@ -1,18 +1,25 @@
|
|||||||
version: '2'
|
version: '2'
|
||||||
services:
|
services:
|
||||||
|
config:
|
||||||
|
image: nginx
|
||||||
|
volumes:
|
||||||
|
- ./config:/usr/share/nginx/html:ro
|
||||||
|
|
||||||
buildbot:
|
buildbot:
|
||||||
image: buildbot/buildbot-master:master
|
image: buildbot/buildbot-master:master
|
||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
environment:
|
environment:
|
||||||
- BUILDBOT_CONFIG_DIR=config
|
- BUILDBOT_CONFIG_DIR=config
|
||||||
- BUILDBOT_CONFIG_URL=https://github.com/buildbot/buildbot-docker-example-config/archive/master.tar.gz
|
- BUILDBOT_CONFIG_URL=http://config/master.cfg
|
||||||
- BUILDBOT_WORKER_PORT=9989
|
- BUILDBOT_WORKER_PORT=9989
|
||||||
- BUILDBOT_WEB_URL=http://localhost:8080/
|
- BUILDBOT_WEB_URL=http://localhost:8080/
|
||||||
- BUILDBOT_WEB_PORT=8080
|
- BUILDBOT_WEB_PORT=8080
|
||||||
links:
|
links:
|
||||||
|
- config:config
|
||||||
- db
|
- db
|
||||||
depends_on:
|
depends_on:
|
||||||
|
- config:config
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
Loading…
Reference in New Issue
Block a user