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

Compare commits

base: dezzpil:ffff9ed1d85ddf6b6158fa75636093422791605a
Branches Tags
dezzpil:master
dezzpil:v1.0
..
compare: dezzpil:b29e37bcd6a78bb2c44d7d90b293eda9c64409ba
Branches Tags
dezzpil:master
dezzpil:v1.0

5 Commits
ffff9ed1d8 ... b29e37bcd6

Author SHA1 Message Date
Nikita Orlov
b29e37bcd6 Merge branch 'small-updates' of ddemin/teamcity-in-docker into master 2020-02-25 11:28:04 +03:00
Dmitry Dyomin
a2e211417f Установлен московский часовой пояс 2020-02-21 19:53:29 +03:00
Dmitry Dyomin
6e3e867334 Передавать агентам путь к папке work на хост-машине 2020-02-21 19:07:18 +03:00
Dmitry Dyomin
1823cd07bf Обновление node.js с 11 на 12 2020-02-21 15:40:25 +03:00
Dmitry Dyomin
f477f3c051 Отдельные папки для данных агентов 2020-02-21 15:40:02 +03:00
2 changed files with 9 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM jetbrains/teamcity-agent 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 && apt-get install -y nodejs build-essential nano

12
prod.yml
View File

@ -6,6 +6,8 @@ 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
@ -19,11 +21,12 @@ 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/work:/opt/buildagent/work' - '/opt/buildagent/white/work:/opt/buildagent/work'
- '/opt/buildagent/temp:/opt/buildagent/temp' - '/opt/buildagent/white/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
@ -36,11 +39,12 @@ 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/work:/opt/buildagent/work' - '/opt/buildagent/black/work:/opt/buildagent/work'
- '/opt/buildagent/temp:/opt/buildagent/temp' - '/opt/buildagent/black/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