From f477f3c051941ec0063e7836744b32f601527212 Mon Sep 17 00:00:00 2001 From: Dmitry Dyomin Date: Fri, 21 Feb 2020 15:40:02 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9E=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B0=D0=B3?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prod.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prod.yml b/prod.yml index 144c8c4..ea6499c 100644 --- a/prod.yml +++ b/prod.yml @@ -19,8 +19,8 @@ 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' @@ -36,8 +36,8 @@ 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' -- 2.39.2 From 1823cd07bf36655ee493d66d55b9378726558c8d Mon Sep 17 00:00:00 2001 From: Dmitry Dyomin Date: Fri, 21 Feb 2020 15:40:25 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20node.js=20=D1=81=2011=20=D0=BD=D0=B0=2012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30649f9..b934d77 100644 --- a/Dockerfile +++ b/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 -- 2.39.2 From 6e3e867334595f395c1d3953a5367754ab767ffc Mon Sep 17 00:00:00 2001 From: Dmitry Dyomin Date: Fri, 21 Feb 2020 19:07:18 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=B0=D0=BC?= =?UTF-8?q?=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B5=20work=20=D0=BD=D0=B0=20=D1=85=D0=BE=D1=81=D1=82-=D0=BC?= =?UTF-8?q?=D0=B0=D1=88=D0=B8=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prod.yml b/prod.yml index ea6499c..a52d19e 100644 --- a/prod.yml +++ b/prod.yml @@ -24,6 +24,7 @@ services: environment: SERVER_URL: http://127.0.0.1:80 AGENT_NAME: 'White' + DOCKER_WORK_DIR: /opt/buildagent/white/work restart: always depends_on: - server @@ -41,6 +42,7 @@ services: environment: SERVER_URL: http://127.0.0.1:80 AGENT_NAME: 'Black' + DOCKER_WORK_DIR: /opt/buildagent/black/work restart: always depends_on: - server -- 2.39.2 From a2e211417fb34727a66fad7058bf7096310c7c37 Mon Sep 17 00:00:00 2001 From: Dmitry Dyomin Date: Fri, 21 Feb 2020 19:53:29 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BC=D0=BE=D1=81=D0=BA=D0=BE=D0=B2=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D1=87=D0=B0=D1=81=D0=BE=D0=B2=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=8F=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prod.yml b/prod.yml index a52d19e..8a1303d 100644 --- a/prod.yml +++ b/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 -- 2.39.2