Skip to content

Commit 0245019

Browse files
author
Dmitry Berezovsky
committed
Put build agentt binary into the repository due to the problems with JetBrains server
1 parent 55b4315 commit 0245019

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

Dockerfile

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,65 @@ ENV TEAMCITY_VERSION 2017.2.1
99
ENV TEAMCITY_GIT_PATH /usr/bin/git
1010
ENV AGENT_PORT 9090
1111

12-
RUN curl -LO http://download.jetbrains.com/teamcity/TeamCity-$TEAMCITY_VERSION.war \
13-
&& unzip -qq TeamCity-$TEAMCITY_VERSION.war -d /tmp/teamcity \
14-
&& unzip -qq /tmp/teamcity/update/buildAgent.zip -d /srv/teamcity-agent
12+
COPY buildAgent.zip /tmp/buildAgent.zip
13+
RUN unzip -qq /tmp/buildAgent.zip -d /srv/teamcity-agent
1514

1615
COPY start-agent.sh /srv/
1716

1817
RUN chmod +x /srv/teamcity-agent/bin/*.sh \
1918
&& chmod +x /srv/*.sh \
2019
&& mv /srv/teamcity-agent/conf/buildAgent.dist.properties /srv/teamcity-agent/conf/buildAgent.properties \
2120

22-
&& rm -f TeamCity-$TEAMCITY_VERSION.war \
2321
&& rm -fR /tmp/* \
2422
&& chown -R app:app /srv/teamcity-agent
2523

2624

2725
# ----------------------------------------------------------------------- nodejs
28-
ENV NODE_VERSION 6.9.4
26+
ENV NODE_VERSION 8.9.4
2927

3028
RUN (curl -L http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | gunzip -c | tar x) \
3129
&& cp -R node-v${NODE_VERSION}-linux-x64/* /usr/ \
3230
&& rm -fR node-v${NODE_VERSION}-linux-x64 \
3331
&& npm update -g \
34-
&& npm install -g node-gyp grunt grunt-cli karma-cli bower aglio
32+
&& npm install --unsafe-perm -g node-gyp aglio \
33+
&& npm install -g grunt gulp grunt-cli karma-cli
34+
35+
RUN npm install -g yarn
3536

3637
# ------------------------------------------------------------------------ maven
37-
ENV MAVEN_VERSION 3.3.9
38+
ENV MAVEN_VERSION 3.5.2
3839

3940
RUN (curl -L http://www.us.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | gunzip -c | tar x) \
4041
&& mv apache-maven-$MAVEN_VERSION /opt/apache-maven
4142

4243
ENV M2_HOME /opt/apache-maven
4344
ENV MAVEN_OPTS -Xmx512m -Xss256k -XX:+UseCompressedOops
4445

45-
# ------------------------------------------------------------------------ docker & aws
46+
# ------------------------------------------------------------------------ Python PIP
47+
RUN pip install --upgrade pip
48+
49+
# ------------------------------------------------------------------------ docker
4650

4751
RUN yum install -y python-devel yum-utils jq && yum clean all \
4852
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
4953
&& yum install -y docker-ce \
50-
&& pip install --upgrade docker-compose awscli
54+
&& pip install --upgrade docker-compose
5155
ENV DOCKER_AVAILABLE=1
5256

53-
# ------------------------------------------------------------------------
57+
58+
# ------------------------------------------------------------------------ Python AWS & other tools
59+
RUN yum install jq \
60+
&& pip install --upgrade awscli
61+
AWS_AVAILABLE=1
5462

5563
# ------------------------------------------------------------------------ VCS
5664

5765
RUN yum install -y git subversion
5866
ENV GIT_AVAILABLE=1
5967
ENV SVN_AVAILABLE=1
6068

69+
RUN yum clean all
70+
6171
EXPOSE ${AGENT_PORT}
6272
VOLUME /srv/teamcity-agent/conf
6373
USER app

buildAgent.zip

17.7 MB
Binary file not shown.

0 commit comments

Comments
 (0)