github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115 from djs55/docker-init

Browse Source 
docker: argument is now "--userland-proxy-path"
This commit is contained in:
Justin Cormack 2016-04-29 15:02:52 +01:00
commit d85112bce7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,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-bin /sbin/proxy"
DOCKER_OPTS="${DOCKER_OPTS} --userland-proxy-path /sbin/proxy"
fi
fi