commit 7a6d2cef8b7328cea7ec586c022032a0e978226e Author: Matt Housh <jaeger@morpheus.net> Date: Fri Feb 17 19:05:09 2017 -0600 docker: updated to version 1.13.1 diff --git a/docker/.md5sum b/docker/.md5sum index d24083c..eb9bd13 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,5 +1,5 @@ -23d3875ac67d5b67dd1918c45ba98537 docker-1.13.0.tar.gz -718efdb82ac15865f3e9291f86198117 docker-man-pages-1.13.0.tar.xz +032c39b2390a0f387cdb49bab8c4c712 docker-1.13.1.tar.gz +5ac3b31e62550c47e393b846d82540c0 docker-man-pages-1.13.1.tar.xz 639d3af72199001bb612e545335a67a3 docker.conf -493cf8e992ad384bc53ba682f88dc654 docker.rc +d83f39cc5876fed6daecfbd28cfed4c1 docker.rc c090bba7add57070eebfba7faac324ff libnetwork-0f53435.tar.xz diff --git a/docker/.signature b/docker/.signature index ff1d385..d69f03d 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32ghxn0Lsp1/zt4iiFbs4q0FxaAoFZponnO0sPtfxDmRB1T9ckt6LaAqyXdj5yySHQ52PVBV8PeSp1KgA9b8eAU= -SHA256 (Pkgfile) = ff688cc928b4aa6e5033d8d998eeba146b4856f227ef753d8e7c5644ebe87fcc +RWSagIOpLGJF38KzR3JYRhzax4o7fZQaqfSjV4sLzhGfLaZQyCT0SD2BIKtXHnlvyxqg1WGaXTACBiNYmU6SK2zWpe4IlBA5owE= +SHA256 (Pkgfile) = 6741b0c87f27a3c821f4454b98091597da4d2af7c82db07fa091c051338b03c5 SHA256 (.footprint) = e98f9f2fdd296ba850ffb2a5143b762d20ccefd4fa4a694887692a79b5250566 -SHA256 (docker-1.13.0.tar.gz) = 845cc9a7a48ed1cc60f062882285358a1c2a845b74c5d1d859606a28e4a47d3e -SHA256 (docker-man-pages-1.13.0.tar.xz) = ef9806a1b9ce1c3cbcba2e4c8e2bca9ad824698139c7d89d9453004fb316e8ff +SHA256 (docker-1.13.1.tar.gz) = 2730e7cc15492de8f1d6f9510c64620fc9004c8afc1410bf3ebac9fc3f9f83c6 +SHA256 (docker-man-pages-1.13.1.tar.xz) = c5fc496a78e46abdb267671eb7f9745c598010142699f5c3668da0e7daca8894 SHA256 (libnetwork-0f53435.tar.xz) = 5bfaceda837dd9fccba42bc52c889c823322db7ec3da522342f6e7ebda7dbdf5 -SHA256 (docker.rc) = 978ed80a1952f3cad8a71cf40140b8a39f4f883a28a5c706babbeeb19601be9d +SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index ed0b674..ce198e4 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,7 +4,7 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=1.13.0 +version=1.13.1 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 \ @@ -13,7 +13,7 @@ source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \ build() { export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT=49bf474 + export DOCKER_GITCOMMIT=092cba3 cd $name-$version hack/make.sh dynbinary @@ -21,8 +21,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 (cd ..; \ GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ diff --git a/docker/docker.rc b/docker/docker.rc index 774ab70..ccb56bd 100755 --- a/docker/docker.rc +++ b/docker/docker.rc @@ -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