github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Added bundle detection

Browse Source 
Signed-off-by: French Ben <frenchben@docker.com>
This commit is contained in:
French Ben 2017-02-27 16:19:29 -08:00
parent a76ddbc51d
commit 8d0197d403
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
alpine/packages/docker/Makefile
View File

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