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

Merge pull request #553 from justincormack/docker-init

Browse Source 
Copy docker-init if present
This commit is contained in:
Justin Cormack 2016-09-23 18:14:37 +01:00 committed by GitHub
commit 82a4e55324
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/packages/docker/Makefile
View File

@ -3,8 +3,6 @@ ARCH?=x86_64
OS?=Linux
DOCKER_EXPERIMENTAL?=1
DOCKER_BINARIES?=docker dockerd docker-proxy docker-runc docker-containerd docker-containerd-ctr docker-containerd-shim
all: usr/bin/docker
TEST_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi)
@ -42,9 +40,11 @@ endif
docker/docker-runc \
docker/docker-containerd-shim \
usr/bin/
([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true
hub: cleanusr
docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin $(DOCKER_BINARIES) | tar xf - -C usr/bin
docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin . | tar xf - -C usr/bin
rm -f usr/bin/docker-entrypoint.sh
clean:
rm -rf usr/ docker/