diff options
| author | Matt Housh <jaeger@morpheus.net> | 2017-01-18 16:00:46 -0600 |
|---|---|---|
| committer | Matt Housh <jaeger@morpheus.net> | 2017-01-18 16:00:46 -0600 |
| commit | 53ce9a2f9e736f9c20c1d08a152e800817e3aefd (patch) | |
| tree | b8ec0f67e8bd0d1779a610b8fba08d561ed064c4 /docker | |
| parent | 8f4988ee97ae57e23d1fabaea22b92fb5f2a35fe (diff) | |
| parent | 378b7aaec41d683526da67e3adcd59f58ad0a5eb (diff) | |
| download | contrib-53ce9a2f9e736f9c20c1d08a152e800817e3aefd.tar.gz contrib-53ce9a2f9e736f9c20c1d08a152e800817e3aefd.tar.xz | |
Merge branch '3.2' into 3.3
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/.footprint | 28 | ||||
| -rw-r--r-- | docker/.md5sum | 4 | ||||
| -rw-r--r-- | docker/Pkgfile | 2 |
3 files changed, 3 insertions, 31 deletions
diff --git a/docker/.footprint b/docker/.footprint index f039d03a5..67e40b6ba 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -46,15 +46,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker-network-inspect.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-network-ls.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-network-rm.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-network.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-demote.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-inspect.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-ls.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-promote.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-ps.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-rm.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node-update.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-node.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-pause.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-port.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-ps.1.gz @@ -67,33 +58,14 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker-run.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-save.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-search.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-create.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-inspect.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-ls.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-ps.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-rm.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-scale.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service-update.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-service.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-start.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-stats.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-stop.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm-init.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm-join-token.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm-join.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm-leave.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm-update.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-swarm.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-tag.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-top.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-unpause.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-update.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-version.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-volume-create.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-volume-inspect.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-volume-ls.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-volume-rm.1.gz --rw-r--r-- root/root usr/share/man/man1/docker-volume.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-wait.1.gz -rw-r--r-- root/root usr/share/man/man1/docker.1.gz drwxr-xr-x root/root usr/share/man/man5/ diff --git a/docker/.md5sum b/docker/.md5sum index 1f35335b7..f997a4536 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ -40510f377b781c72847ae6a06fdbb175 docker-1.12.3.tar.gz -a1dce6daafccc32bb691fe19aa1e9d4f docker-man-pages-1.12.3.tar.xz +2db317ab9811641449784fe0fb29d74f docker-1.12.6.tar.gz +e191cd2164f177d4ba850fc6b8580e24 docker-man-pages-1.12.6.tar.xz 639d3af72199001bb612e545335a67a3 docker.conf 493cf8e992ad384bc53ba682f88dc654 docker.rc diff --git a/docker/Pkgfile b/docker/Pkgfile index 45dcc1147..e170d99b8 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,7 +4,7 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=1.12.3 +version=1.12.6 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 \ |