github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +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 9d3483736e
commit dd5fe0455b
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/Dockerfile
View File

@ -35,8 +35,8 @@ COPY mkinitrd.sh /bin/
COPY kernel/kernel-source-info /etc/ COPY kernel/kernel-source-info /etc/
ADD kernel/kernel-patches.tar /etc/kernel-patches ADD kernel/kernel-patches.tar /etc/kernel-patches
COPY packages/proxy/proxy /sbin/ COPY packages/proxy/slirp-proxy /usr/bin/
COPY packages/proxy/proxy /sbin/proxy-vsockd COPY packages/proxy/slirp-proxy /sbin/proxy-vsockd
COPY packages/proxy/etc /etc/ COPY packages/proxy/etc /etc/
COPY packages/transfused/transfused /sbin/ COPY packages/transfused/transfused /sbin/
COPY packages/transfused/etc /etc/ COPY packages/transfused/etc /etc/

7
alpine/packages/diagnostics/diagnostics
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
# now start very soon after docker, let containerd start
sleep 1
printf '\n' printf '\n'
DEV=$(ls /dev | grep '[sxv]da$') DEV=$(ls /dev | grep '[sxv]da$')
[ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n" [ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n"
@ -14,8 +17,8 @@ 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"
fi fi
DOCKER=$(ps -eo args | grep '^/usr/bin/docker') DOCKER=$(ps -eo args | grep '^/usr/bin/dockerd')
[ $? -eq 0 ] && printf "✓ Process docker running: $DOCKER\n" || printf "✗ No docker process\n" [ $? -eq 0 ] && printf "✓ Process dockerd running: $DOCKER\n" || printf "✗ No dockerd process\n"
CONTAINERD=$(ps -eo args | grep '^docker-containerd') CONTAINERD=$(ps -eo args | grep '^docker-containerd')
[ $? -eq 0 ] && printf "✓ Process containerd running: $CONTAINERD\n" || printf "✗ No containerd process\n" [ $? -eq 0 ] && printf "✓ Process containerd running: $CONTAINERD\n" || printf "✗ No containerd process\n"
DOCKERPS=$(docker ps 2>&1) DOCKERPS=$(docker ps 2>&1)

10
alpine/packages/docker/Makefile
View File

@ -1,4 +1,4 @@
DOCKER_VERSION=1.11.2 DOCKER_VERSION=1.12-dev
ARCH?=x86_64 ARCH?=x86_64
OS?=Linux OS?=Linux
@ -8,10 +8,10 @@ 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 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/latest/binary-daemon/{dockerd,docker-runc} bin/
rm -f bin/*.md5 cp docker.git/bundles/latest/binary-daemon/{docker-containerd,docker-containerd-shim,docker-containerd-ctr} bin/
rm -f bin/*.sha256 cp docker.git/bundles/latest/binary-daemon/docker-proxy bin/
rm -f bin/docker-${DOCKER_VERSION} cp docker.git/bundles/latest/binary-client/docker bin/
docker.git: docker.git:
git clone git://github.com/justincormack/docker.git 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" ebegin "Starting Docker"
command="${DOCKER_BINARY:-/usr/bin/docker}" command="${DOCKER_BINARY:-/usr/bin/dockerd}"
pidfile="/run/docker.pid" pidfile="/run/docker.pid"
@ -31,7 +31,7 @@ start()
NETWORK_MODE="$(mobyconfig get network | tr -d '[[:space:]]')" NETWORK_MODE="$(mobyconfig get network | tr -d '[[:space:]]')"
NATIVE_PORT_FORWARDING="$(mobyconfig get native/port-forwarding | tr -d '[[:space:]]')" NATIVE_PORT_FORWARDING="$(mobyconfig get native/port-forwarding | tr -d '[[:space:]]')"
if [ "${NETWORK_MODE}" = "slirp" -o "${NATIVE_PORT_FORWARDING}" = "true" ]; then 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
fi fi
@ -74,7 +74,7 @@ start()
--pidfile ${pidfile} \ --pidfile ${pidfile} \
--stderr "${DOCKER_LOGFILE}" \ --stderr "${DOCKER_LOGFILE}" \
--stdout "${DOCKER_LOGFILE}" \ --stdout "${DOCKER_LOGFILE}" \
-- daemon --pidfile=${pidfile} ${DOCKER_OPTS} -- --pidfile=${pidfile} ${DOCKER_OPTS}
eend $? "Failed to start docker" eend $? "Failed to start docker"
} }

4
alpine/packages/proxy/.gitignore vendored
View File

@ -1,2 +1,2 @@
/proxy /slirp-proxy
/vendor /vendor

6
alpine/packages/proxy/Makefile
View File

@ -7,9 +7,9 @@ vendor:
proxy: Dockerfile main.go proxy.go vendor proxy: Dockerfile main.go proxy.go vendor
docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t proxy:build . docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t proxy:build .
docker run --rm proxy:build cat /go/bin/proxy > proxy docker run --rm proxy:build cat /go/bin/proxy > slirp-proxy
chmod 755 proxy chmod 755 slirp-proxy
clean: clean:
rm -rf proxy vendor rm -rf slirp-proxy vendor
docker images -q proxy:build | xargs docker rmi -f || true docker images -q proxy:build | xargs docker rmi -f || true