github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-04 03:09:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1217 from FrenchBen/handle-bundles

Browse Source 
Added support for bundles generated from CI
This commit is contained in:
Justin Cormack
2017-02-28 13:37:47 -08:00
committed by GitHub
parent 11b7616e92 66710a38a2
commit edb48c0a13
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
alpine/packages/docker/Makefile
View File

@@ -53,6 +53,16 @@ else
(curl -fsSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf -
endif
rm ok
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 \
@@ -60,7 +70,7 @@ endif
docker/docker-proxy \
docker/docker-runc \
docker/docker-containerd-shim \
usr/bin/
usr/bin/ ; fi
([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true
([ -d docker/completion ] && rm -rf docker/completion) || true