Merge branch 'small-updates' of ddemin/teamcity-in-docker into master

Dockerfile

@@ -1,4 +1,4 @@
 FROM jetbrains/teamcity-agent
 
-RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
     && apt-get install -y nodejs build-essential nano

prod.yml

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