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

Merge pull request #745 from justincormack/1.13-test

Browse Source 
upgrade Docker to 1.13.0-rc1
This commit is contained in:
Justin Cormack 2016-11-16 16:53:21 +00:00 committed by GitHub
commit cb9a34cbee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
DOCKER_EXPERIMENTAL?=1 DOCKER_EXPERIMENTAL?=0
all: all:
$(MAKE) -C alpine $(MAKE) -C alpine

4
alpine/packages/docker/Makefile
View File

@ -1,8 +1,8 @@
DOCKER_VERSION?=1.12.3 DOCKER_VERSION?=1.13.0-rc1
FORCE_CURL?=1 FORCE_CURL?=1
ARCH?=x86_64 ARCH?=x86_64
OS?=Linux OS?=Linux
DOCKER_EXPERIMENTAL?=1 DOCKER_EXPERIMENTAL?=0
all: usr/bin/docker all: usr/bin/docker