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

Merge pull request #211 from justincormack/docker-1.12.0-rc1

Browse Source 
Docker 1.12.0 rc1
This commit is contained in:
Justin Cormack 2016-06-15 10:43:41 +01:00 committed by GitHub
commit 1b61788c2a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/packages/diagnostics/diagnostics
View File

@ -12,7 +12,7 @@ INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr')
[ $? -eq 0 ] && printf "✓ Network connected: $INET\n" || printf "✗ No network connection\n" [ $? -eq 0 ] && printf "✓ Network connected: $INET\n" || printf "✗ No network connection\n"
FUSE=$(ps -eo args | grep '^/sbin/transfused') FUSE=$(ps -eo args | grep '^/sbin/transfused')
[ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n" [ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n"
if [ ! -d /sys/bus/vmbus ] if [ -d /sys/bus/vmbus ]
then then
TAPVS=$(ps -eo args | grep '^/sbin/tap-vsockd') TAPVS=$(ps -eo args | grep '^/sbin/tap-vsockd')
[ $? -eq 0 ] && printf "✓ Process tap-vsockd running\n" || printf "✗ No tap-vsockd process\n" [ $? -eq 0 ] && printf "✓ Process tap-vsockd running\n" || printf "✗ No tap-vsockd process\n"

5
alpine/packages/docker/Makefile
View File

@ -1,12 +1,13 @@
DOCKER_VERSION=1.12-dev DOCKER_VERSION=1.12.0-rc1
ARCH?=x86_64 ARCH?=x86_64
OS?=Linux OS?=Linux
EXPERIMENTAL?=1
all: bin all: bin
bin: docker.git bin: docker.git
(cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION)) (cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION))
BIND_DIR=$(shell pwd) make -C docker.git binary DOCKER_EXPERIMENTAL=$(EXPERIMENTAL) BIND_DIR=$(shell pwd) make -C docker.git binary
mkdir -p bin mkdir -p bin
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/ cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/
cp docker.git/bundles/latest/binary-daemon/{docker-containerd,docker-containerd-shim,docker-containerd-ctr} bin/ cp docker.git/bundles/latest/binary-daemon/{docker-containerd,docker-containerd-shim,docker-containerd-ctr} bin/