github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-02 15:31:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #172 from justincormack/docker-1.11.2

Browse Source 
Update docker to 1.11.2+patches
This commit is contained in:
Justin Cormack 2016-06-03 13:28:11 +01:00
commit aa5118fd5f
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

@ -1,11 +1,11 @@
DOCKER_VERSION=1.11.1 DOCKER_VERSION=1.11.2
ARCH?=x86_64 ARCH?=x86_64
OS?=Linux OS?=Linux
all: bin all: bin
bin: docker.git bin: docker.git
(cd docker.git && git fetch origin --tags && git checkout moby) (cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION))
BIND_DIR=$(shell pwd) make -C docker.git binary BIND_DIR=$(shell pwd) make -C docker.git binary
mkdir -p bin mkdir -p bin
cp docker.git/bundles/${DOCKER_VERSION}/binary/* bin/ cp docker.git/bundles/${DOCKER_VERSION}/binary/* bin/
@ -14,7 +14,7 @@ bin: docker.git
rm -f bin/docker-${DOCKER_VERSION} rm -f bin/docker-${DOCKER_VERSION}
docker.git: docker.git:
git clone git://github.com/djs55/docker.git docker.git git clone git://github.com/justincormack/docker.git docker.git
arm: arm:
mkdir -p bin mkdir -p bin