diff bamboo-agent/Dockerfile @ 326:b35f4af06ed4 production vv2.6.0

flow: Merged <release> 'v2.6.0' to <master> ('production').
author aldrich@ssdt-ohio.org
date Tue, 12 Nov 2019 16:16:00 +0000
parents 83f30dc7e9fb
children
line wrap: on
line diff
--- a/bamboo-agent/Dockerfile	Wed May 01 15:33:00 2019 +0100
+++ b/bamboo-agent/Dockerfile	Tue Nov 12 16:16:00 2019 +0000
@@ -3,6 +3,8 @@
 RUN apt-get update
 RUN apt-get install -y ca-certificates
 
+####NOTE we are no longer using the docker-bamboo agent images due to migration to mutli-agent servers.
+
 # set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses)
 # - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149
 # - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275
@@ -36,9 +38,15 @@
 
     && apt-get install -y openjdk-8-jdk \
 
-    && apt-get install -y zip
+    && apt-get install -y zip 
+	
+
+
+#RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
+#dpkg-reconfigure -f noninteractive tzdata
+
     
-ENV ANT_VERSION 1.10.5
+ENV ANT_VERSION 1.10.6
 RUN cd && \
     curl -fL -o apache-ant-bin.tar.gz http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
     tar -xzf apache-ant-bin.tar.gz && \
@@ -84,6 +92,11 @@
 
 RUN chmod +x /usr/local/bin/docker-compose
 
+RUN apt-get install tzdata
+
+RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
+dpkg-reconfigure -f noninteractive tzdata
+
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 CMD java -jar /root/atlassian-bamboo-agent-installer-6.5.0.jar $BAMBOO_SERVER/agentServer/