@@ -9,55 +9,65 @@ ENV TEAMCITY_VERSION 2017.2.1
9
9
ENV TEAMCITY_GIT_PATH /usr/bin/git
10
10
ENV AGENT_PORT 9090
11
11
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
15
14
16
15
COPY start-agent.sh /srv/
17
16
18
17
RUN chmod +x /srv/teamcity-agent/bin/*.sh \
19
18
&& chmod +x /srv/*.sh \
20
19
&& mv /srv/teamcity-agent/conf/buildAgent.dist.properties /srv/teamcity-agent/conf/buildAgent.properties \
21
20
22
- && rm -f TeamCity-$TEAMCITY_VERSION.war \
23
21
&& rm -fR /tmp/* \
24
22
&& chown -R app:app /srv/teamcity-agent
25
23
26
24
27
25
# ----------------------------------------------------------------------- nodejs
28
- ENV NODE_VERSION 6 .9.4
26
+ ENV NODE_VERSION 8 .9.4
29
27
30
28
RUN (curl -L http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | gunzip -c | tar x) \
31
29
&& cp -R node-v${NODE_VERSION}-linux-x64/* /usr/ \
32
30
&& rm -fR node-v${NODE_VERSION}-linux-x64 \
33
31
&& 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
35
36
36
37
# ------------------------------------------------------------------------ maven
37
- ENV MAVEN_VERSION 3.3.9
38
+ ENV MAVEN_VERSION 3.5.2
38
39
39
40
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) \
40
41
&& mv apache-maven-$MAVEN_VERSION /opt/apache-maven
41
42
42
43
ENV M2_HOME /opt/apache-maven
43
44
ENV MAVEN_OPTS -Xmx512m -Xss256k -XX:+UseCompressedOops
44
45
45
- # ------------------------------------------------------------------------ docker & aws
46
+ # ------------------------------------------------------------------------ Python PIP
47
+ RUN pip install --upgrade pip
48
+
49
+ # ------------------------------------------------------------------------ docker
46
50
47
51
RUN yum install -y python-devel yum-utils jq && yum clean all \
48
52
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
49
53
&& yum install -y docker-ce \
50
- && pip install --upgrade docker-compose awscli
54
+ && pip install --upgrade docker-compose
51
55
ENV DOCKER_AVAILABLE=1
52
56
53
- # ------------------------------------------------------------------------
57
+
58
+ # ------------------------------------------------------------------------ Python AWS & other tools
59
+ RUN yum install jq \
60
+ && pip install --upgrade awscli
61
+ AWS_AVAILABLE=1
54
62
55
63
# ------------------------------------------------------------------------ VCS
56
64
57
65
RUN yum install -y git subversion
58
66
ENV GIT_AVAILABLE=1
59
67
ENV SVN_AVAILABLE=1
60
68
69
+ RUN yum clean all
70
+
61
71
EXPOSE ${AGENT_PORT}
62
72
VOLUME /srv/teamcity-agent/conf
63
73
USER app
0 commit comments