github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-30 05:13:52 +00:00
Code Issues Projects Releases Wiki Activity

Update to docker 1.12-dev plus proxy patches, close to what will be rc1

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2016-06-14 14:13:36 +01:00
parent d99deeb003
commit 759ad55f03
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
alpine/packages/docker/Makefile
View File

@@ -1,4 +1,4 @@
DOCKER_VERSION=1.11.2
DOCKER_VERSION=1.12-dev
ARCH?=x86_64
OS?=Linux
@@ -8,10 +8,10 @@ bin: docker.git
(cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION))
BIND_DIR=$(shell pwd) make -C docker.git binary
mkdir -p bin
cp docker.git/bundles/${DOCKER_VERSION}/binary/* bin/
rm -f bin/*.md5
rm -f bin/*.sha256
rm -f bin/docker-${DOCKER_VERSION}
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-proxy bin/
cp docker.git/bundles/latest/binary-client/docker bin/
docker.git:
git clone git://github.com/justincormack/docker.git docker.git

6
alpine/packages/docker/etc/init.d/docker
View File

@@ -9,7 +9,7 @@ start()
{
ebegin "Starting Docker"
command="${DOCKER_BINARY:-/usr/bin/docker}"
command="${DOCKER_BINARY:-/usr/bin/dockerd}"
pidfile="/run/docker.pid"
@@ -31,7 +31,7 @@ start()
NETWORK_MODE="$(mobyconfig get network | tr -d '[[:space:]]')"
NATIVE_PORT_FORWARDING="$(mobyconfig get native/port-forwarding | tr -d '[[:space:]]')"
if [ "${NETWORK_MODE}" = "slirp" -o "${NATIVE_PORT_FORWARDING}" = "true" ]; then
DOCKER_OPTS="${DOCKER_OPTS} --userland-proxy-path /sbin/proxy"
cp /usr/bin/slirp-proxy /usr/bin/docker-proxy
fi
fi
@@ -74,7 +74,7 @@ start()
--pidfile ${pidfile} \
--stderr "${DOCKER_LOGFILE}" \
--stdout "${DOCKER_LOGFILE}" \
-- daemon --pidfile=${pidfile} ${DOCKER_OPTS}
-- --pidfile=${pidfile} ${DOCKER_OPTS}
eend $? "Failed to start docker"
}