Mercurial > public > ssdt-docker

changeset 312:6bd1eb71db59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix adding for timezone
author aldrich@nwoca.org
date Thu, 27 Jun 2019 19:10:31 +0100
parents e23a3e570b2d
children 06e92ad77e7f
files bamboo-agent/Dockerfile
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bamboo-agent/Dockerfile	Thu Jun 27 19:04:41 2019 +0100
+++ b/bamboo-agent/Dockerfile	Thu Jun 27 19:10:31 2019 +0100
@@ -38,9 +38,7 @@
 
     && apt-get install -y zip 
 	
-#	&& apt-get install tzdata 
 
-RUN apt-get install tzdata
 
 #RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
 #dpkg-reconfigure -f noninteractive tzdata
@@ -92,6 +90,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/