Merge branch 'master' of github.com:DURAARK/microservice-base

Conflicts: Dockerfile
DURAARK · Dec 2, 2015 · 8ed53fd · 8ed53fd
2 parents 53a6a18 + 758973f
commit 8ed53fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get install python software-properties-common -y && add-apt-repository p
 ## Docker & docker-compose
 ##
 RUN curl -sSL https://get.docker.com | sh
-RUN curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+RUN curl -L https://github.com/docker/compose/releases/download/1.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 RUN chmod +x /usr/local/bin/docker-compose
 
 ##