Added bundle detection
-ifdef BUNDLE
-DOCKER_VERSION?=${BUNDLE}
-else
-DOCKER_VERSION?=17.03.0-ce-rc1
-endif
+DOCKER_VERSION?=17.03.0-ce
FORCE_CURL?=1
ARCH?=x86_64
OS?=Linux
@@ -56,16 +52,16 @@ else
(curl -fsSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf -
endif
rm ok
-ifdef BUNDLE
- mv bundles/${BUNDLE}/binary-daemon/docker-containerd-ctr \
- bundles/${BUNDLE}/binary-client/docker \
- bundles/${BUNDLE}/binary-daemon/docker-containerd \
- bundles/${BUNDLE}/binary-daemon/dockerd \
- bundles/${BUNDLE}/binary-daemon/docker-proxy \
- bundles/${BUNDLE}/binary-daemon/docker-runc \
- bundles/${BUNDLE}/binary-daemon/docker-containerd-shim \
- usr/bin/
-else
+ if [ -d "./bundles" ]; then \
+ mv bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd-ctr \
+ bundles/${DOCKER_VERSION}/binary-client/docker \
+ bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd \
+ bundles/${DOCKER_VERSION}/binary-daemon/dockerd \
+ bundles/${DOCKER_VERSION}/binary-daemon/docker-proxy \
+ bundles/${DOCKER_VERSION}/binary-daemon/docker-runc \
+ bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd-shim \
+ usr/bin/ ;\
+ else \
mv docker/docker-containerd-ctr \
docker/docker \
docker/docker-containerd \
@@ -73,8 +69,7 @@ else
docker/docker-proxy \
docker/docker-runc \
docker/docker-containerd-shim \
- usr/bin/
-endif
+ usr/bin/ ; fi
([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true
([ -d docker/completion ] && rm -rf docker/completion) || true
