docker: updated to version 1.13.0

This commit is contained in:
Matt Housh 2017-01-25 13:20:10 -06:00
parent a7bf5363f0
commit 85cb714334
4 changed files with 7 additions and 10 deletions

View File

@ -13,7 +13,6 @@ drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/docker-containerd -> containerd
lrwxrwxrwx root/root usr/bin/docker-containerd-ctr -> ctr
lrwxrwxrwx root/root usr/bin/docker-containerd-shim -> containerd-shim
-rwxr-xr-x root/root usr/bin/docker-proxy
lrwxrwxrwx root/root usr/bin/docker-runc -> runc
-rwxr-xr-x root/root usr/bin/dockerd
drwxr-xr-x root/root usr/share/

View File

@ -1,4 +1,4 @@
2db317ab9811641449784fe0fb29d74f docker-1.12.6.tar.gz
e191cd2164f177d4ba850fc6b8580e24 docker-man-pages-1.12.6.tar.xz
23d3875ac67d5b67dd1918c45ba98537 docker-1.13.0.tar.gz
718efdb82ac15865f3e9291f86198117 docker-man-pages-1.13.0.tar.xz
639d3af72199001bb612e545335a67a3 docker.conf
493cf8e992ad384bc53ba682f88dc654 docker.rc
d83f39cc5876fed6daecfbd28cfed4c1 docker.rc

View File

@ -4,7 +4,7 @@
# Depends on: containerd runc btrfs-progs cgroupfs-mount
name=docker
version=1.12.6
version=1.13.0
release=1
source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \
http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \
@ -12,7 +12,7 @@ source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \
build() {
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT=6b644ec
export DOCKER_GITCOMMIT=49bf474
cd $name-$version
hack/make.sh dynbinary
@ -20,8 +20,6 @@ build() {
$PKG/usr/bin/$name
install -D -m 0755 bundles/$version/dynbinary-daemon/dockerd-$version \
$PKG/usr/bin/dockerd
install -D -m 0755 bundles/$version/dynbinary-daemon/$name-proxy-$version \
$PKG/usr/bin/$name-proxy
for M in 1 5 8; do
install -d -m 0755 $PKG/usr/share/man/man${M}

View File

@ -4,7 +4,7 @@
#
SSD=/sbin/start-stop-daemon
PROG=/usr/bin/docker
PROG=/usr/bin/dockerd
PID=/var/run/docker.pid
CONF=/etc/docker.conf
LOG=/var/log/docker.log
@ -27,7 +27,7 @@ case $1 in
/usr/bin/cgroupfs-mount
$SSD --start --pidfile $PID --background --exec $PROG -- daemon $OPTS >> $LOG 2>&1
$SSD --start --pidfile $PID --background --exec $PROG -- $OPTS >> $LOG 2>&1
;;
stop)
$SSD --stop --retry 10 --pidfile $PID