dezzpil/teamcity-in-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'Отдельные папки для данных агентов; убрана переменная TZ на сервере' (#2) from ddemin/teamcity-in-docker:separate-worker-data-dirs into master

Browse Source 
осом
This commit is contained in:
Nikita Orlov 2020-09-04 13:23:46 +03:00
commit f91a1a7dbc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
prod.yml
View File

@ -6,8 +6,6 @@ services:
volumes: volumes:
- '/var/data/teamcity/server:/data/teamcity_server/datadir' - '/var/data/teamcity/server:/data/teamcity_server/datadir'
- '/var/log/teamcity/server:/opt/teamcity/logs' - '/var/log/teamcity/server:/opt/teamcity/logs'
environment:
TZ: Europe/Moscow
ports: ports:
- '80:8111' - '80:8111'
restart: always restart: always
@ -21,12 +19,11 @@ services:
volumes: volumes:
- '/var/data/teamcity/agent-white:/data/teamcity_agent/conf' - '/var/data/teamcity/agent-white:/data/teamcity_agent/conf'
- '/var/run/docker.sock:/var/run/docker.sock' - '/var/run/docker.sock:/var/run/docker.sock'
- '/opt/buildagent/white/work:/opt/buildagent/work' - '/opt/buildagent/work:/opt/buildagent/work'
- '/opt/buildagent/white/temp:/opt/buildagent/temp' - '/opt/buildagent/temp:/opt/buildagent/temp'
environment: environment:
SERVER_URL: http://127.0.0.1:80 SERVER_URL: http://127.0.0.1:80
AGENT_NAME: 'White' AGENT_NAME: 'White'
DOCKER_WORK_DIR: /opt/buildagent/white/work
restart: always restart: always
depends_on: depends_on:
- server - server
@ -39,12 +36,11 @@ services:
volumes: volumes:
- '/var/data/teamcity/agent-black:/data/teamcity_agent/conf' - '/var/data/teamcity/agent-black:/data/teamcity_agent/conf'
- '/var/run/docker.sock:/var/run/docker.sock' - '/var/run/docker.sock:/var/run/docker.sock'
- '/opt/buildagent/black/work:/opt/buildagent/work' - '/opt/buildagent/work:/opt/buildagent/work'
- '/opt/buildagent/black/temp:/opt/buildagent/temp' - '/opt/buildagent/temp:/opt/buildagent/temp'
environment: environment:
SERVER_URL: http://127.0.0.1:80 SERVER_URL: http://127.0.0.1:80
AGENT_NAME: 'Black' AGENT_NAME: 'Black'
DOCKER_WORK_DIR: /opt/buildagent/black/work
restart: always restart: always
depends_on: depends_on:
- server - server