github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 22:21:34 +00:00
Code Issues Projects Releases Wiki Activity

clean up docker Makefile

Browse Source 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-10 18:25:25 +01:00 committed by Justin Cormack
parent cc89e32c03
commit 98beff2fa0
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/packages/Makefile
View File

@ -4,7 +4,7 @@ all:
$(MAKE) -C transfused OS=linux $(MAKE) -C transfused OS=linux
$(MAKE) -C tap-vsockd OS=linux $(MAKE) -C tap-vsockd OS=linux
$(MAKE) -C hvtools OS=linux $(MAKE) -C hvtools OS=linux
$(MAKE) -C docker OS=Linux $(MAKE) -C docker
$(MAKE) -C nc-vsock OS=linux $(MAKE) -C nc-vsock OS=linux
$(MAKE) -C vsudd $(MAKE) -C vsudd
$(MAKE) -C 9pmount-vsock OS=linux $(MAKE) -C 9pmount-vsock OS=linux

1
alpine/packages/docker/.gitignore vendored
View File

@ -1,2 +1 @@
bin/ bin/
docker.git

13
alpine/packages/docker/Makefile
View File

@ -3,16 +3,15 @@ ARCH?=x86_64
OS?=Linux OS?=Linux
DOCKER_EXPERIMENTAL?=1 DOCKER_EXPERIMENTAL?=1
all: bin all: bin/docker
TEST_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) TEST_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi)
DOCKER_HOST?=$(shell [ "${DOCKER_EXPERIMENTAL}" -eq 1 ] && printf "experimental.docker.com" || printf "${TEST_HOST}") DOCKER_HOST?=$(shell [ "${DOCKER_EXPERIMENTAL}" -eq 1 ] && printf "experimental.docker.com" || printf "${TEST_HOST}")
DOCKER_BIN_URL?="https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz" DOCKER_BIN_URL?="https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz"
bin: bin/docker:
mkdir -p bin mkdir -p bin
curl -sSL -o docker.tgz ${DOCKER_BIN_URL} curl -sSL ${DOCKER_BIN_URL} | tar xzf - && \
tar xzf docker.tgz && \
mv docker/docker-containerd-ctr \ mv docker/docker-containerd-ctr \
docker/docker \ docker/docker \
docker/docker-containerd \ docker/docker-containerd \
@ -21,8 +20,8 @@ bin:
docker/docker-runc \ docker/docker-runc \
docker/docker-containerd-shim \ docker/docker-containerd-shim \
bin/ bin/
rm -rf docker/ docker.tgz
chmod +x bin/*
clean: clean:
rm -rf bin docker/ docker.tgz rm -rf bin/ docker/
.DELETE_ON_ERROR: