diff --git a/config/master.cfg b/config/master.cfg new file mode 120000 index 0000000..d72fd3f --- /dev/null +++ b/config/master.cfg @@ -0,0 +1 @@ +../master.cfg \ No newline at end of file diff --git a/multimaster/docker-compose.yml b/multimaster/docker-compose.yml index a639b67..f9571b5 100644 --- a/multimaster/docker-compose.yml +++ b/multimaster/docker-compose.yml @@ -14,12 +14,17 @@ services: - 8080:8080 - 9989:9989 # for external workers + config: + image: nginx + volumes: + - ./config:/usr/share/nginx/html:ro + buildbot: image: buildbot/buildbot-master:latest env_file: db.env environment: - 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_WEB_URL=http://localhost:8080/ - BUILDBOT_WEB_PORT=8080 @@ -28,6 +33,7 @@ services: - BUILDBOT_MQ_REALM=realm1 - TCP_PORTS=8080,9989 links: + - config:config - db expose: - 8080 diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index 3eb1bc1..38f81f1 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -1,18 +1,25 @@ version: '2' services: + config: + image: nginx + volumes: + - ./config:/usr/share/nginx/html:ro + buildbot: image: buildbot/buildbot-master:master env_file: - db.env environment: - 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_WEB_URL=http://localhost:8080/ - BUILDBOT_WEB_PORT=8080 links: + - config:config - db depends_on: + - config:config - db ports: - "8080:8080"