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 #436 from justincormack/fixproxy

Browse Source 
Always copy in docker-proxy
This commit is contained in:
Justin Cormack 2016-08-26 09:19:37 +01:00 committed by GitHub
commit 2121afb71d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/packages/docker/Makefile
View File

@ -8,8 +8,6 @@ all: bin
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}")
# Note we do not copy docker-proxy in as we override with our own version
bin: bin:
mkdir -p bin mkdir -p bin
curl -sSL -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz curl -sSL -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz
@ -18,6 +16,7 @@ bin:
docker/docker \ docker/docker \
docker/docker-containerd \ docker/docker-containerd \
docker/dockerd \ docker/dockerd \
docker/docker-proxy \
docker/docker-runc \ docker/docker-runc \
docker/docker-containerd-shim \ docker/docker-containerd-shim \
bin/ bin/