|
@@ -15,13 +15,18 @@ RUN set -ex; \
|
|
|
; \
|
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
|
|
-ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0
|
|
|
-
|
|
|
-RUN set -ex; \
|
|
|
- for v in ${ALL_DOCKER_VERSIONS}; do \
|
|
|
- curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
|
|
|
- chmod +x /usr/local/bin/docker-$v; \
|
|
|
- done
|
|
|
+# ENV ALL_DOCKER_VERSIONS 1.6.0
|
|
|
+
|
|
|
+# RUN set -ex; \
|
|
|
+# for v in ${ALL_DOCKER_VERSIONS}; do \
|
|
|
+# curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
|
|
|
+# chmod +x /usr/local/bin/docker-$v; \
|
|
|
+# done
|
|
|
+
|
|
|
+# Temporarily use dev version of Docker
|
|
|
+ENV ALL_DOCKER_VERSIONS dev
|
|
|
+RUN curl https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev > /usr/local/bin/docker-dev
|
|
|
+RUN chmod +x /usr/local/bin/docker-dev
|
|
|
|
|
|
RUN useradd -d /home/user -m -s /bin/bash user
|
|
|
WORKDIR /code/
|