# HG changeset patch # User aldrich@nwoca.org # Date 1527094002 -3600 # Node ID 538179e4c6756067b87ebeccf0b74637ae656291 # Parent 30d959c35269c5537065b782fdd87c9c07b7bbeb adding bamboo agent configuration files - fix 2 diff -r 30d959c35269 -r 538179e4c675 bamboo-agent/Dockerfile --- 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/