changeset 253:538179e4c675

adding bamboo agent configuration files - fix 2
author aldrich@nwoca.org
date Wed, 23 May 2018 17:46:42 +0100
parents 30d959c35269
children 9c22ca071995
files bamboo-agent/Dockerfile
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bamboo-agent/Dockerfile	Wed May 23 17:22:04 2018 +0100
+++ b/bamboo-agent/Dockerfile	Wed May 23 17:46:42 2018 +0100
@@ -24,9 +24,9 @@
 
 RUN apt-get install -y mercurial \
 
-    && apt-get install -y vim \
+#    && apt-get install -y vim \
 
-    && apt-get install -y nano \
+#    && apt-get install -y nano \
 
     && apt-get install -y tar \
 
@@ -70,6 +70,10 @@
 RUN mkdir -p /root/bamboo-agent-home/bin
 COPY bamboo-capabilities.properties /root/bamboo-agent-home/bin/bamboo-capabilities.properties
 
+RUN curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+
+RUN chmod +x /usr/local/bin/docker-compose
+
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 CMD java -jar /root/atlassian-bamboo-agent-installer-6.5.0.jar $BAMBOO_SERVER/agentServer/