diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2016-12-06 23:09:57 +0100 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2016-12-06 23:09:57 +0100 |
| commit | 693a7221107c5fb2b572b07f28eea73c39c5ca2f (patch) | |
| tree | 564a7a1bc52b7ca87236386f03a2a28349abbf61 /docker | |
| parent | 32373a14702ef40efc02e233cf92378185b956f3 (diff) | |
| parent | 1bccd5b5b1062ea09967f1cebb1553d1af324532 (diff) | |
| download | contrib-693a7221107c5fb2b572b07f28eea73c39c5ca2f.tar.gz contrib-693a7221107c5fb2b572b07f28eea73c39c5ca2f.tar.xz | |
Merge branch '3.2' into 3.3
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/.footprint | 29 | ||||
| -rw-r--r-- | docker/.md5sum | 4 | ||||
| -rw-r--r-- | docker/Pkgfile | 10 |
3 files changed, 36 insertions, 7 deletions
diff --git a/docker/.footprint b/docker/.footprint index ec6239dea..f039d03a5 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -13,7 +13,9 @@ 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/ drwxr-xr-x root/root usr/share/docker/ -rwxr-xr-x root/root usr/share/docker/check-config.sh @@ -44,6 +46,15 @@ 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 @@ -56,9 +67,23 @@ 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 @@ -73,6 +98,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker.1.gz drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/Dockerfile.5.gz --rw-r--r-- root/root usr/share/man/man5/config-json.5.gz +-rw-r--r-- root/root usr/share/man/man5/docker-config-json.5.gz drwxr-xr-x root/root usr/share/man/man8/ --rw-r--r-- root/root usr/share/man/man8/docker-daemon.8.gz +-rw-r--r-- root/root usr/share/man/man8/dockerd.8.gz diff --git a/docker/.md5sum b/docker/.md5sum index 8708b7f6c..1f35335b7 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ -ada4a756f71886049ad793cab8787de8 docker-1.11.2.tar.gz -89f0e41efe4ef5c1884f8fd173b3ef25 docker-man-pages-1.11.2.tar.xz +40510f377b781c72847ae6a06fdbb175 docker-1.12.3.tar.gz +a1dce6daafccc32bb691fe19aa1e9d4f docker-man-pages-1.12.3.tar.xz 639d3af72199001bb612e545335a67a3 docker.conf 493cf8e992ad384bc53ba682f88dc654 docker.rc diff --git a/docker/Pkgfile b/docker/Pkgfile index f4072288a..45dcc1147 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,7 +4,7 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=1.11.2 +version=1.12.3 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,12 +12,16 @@ source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \ build() { export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT=b9f10c9 + export DOCKER_GITCOMMIT=6b644ec cd $name-$version hack/make.sh dynbinary - install -D -m 0755 bundles/$version/dynbinary/$name-$version \ + install -D -m 0755 bundles/$version/dynbinary-client/$name-$version \ $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} |