commit fcccf0265cf334ecfadfea0104bd2077297050f3 Author: Matt Housh <jaeger@crux.ninja> Date: Sun Jun 17 15:23:27 2018 -0500 docker: updated to version 18.05.0-ce diff --git a/docker/.footprint b/docker/.footprint index ccc22d1e..05ddbb40 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -89,6 +89,11 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker-login.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-logout.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-logs.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-manifest-annotate.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-manifest-create.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-manifest-inspect.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-manifest-push.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-manifest.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-network-connect.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-network-create.1.gz -rw-r--r-- root/root usr/share/man/man1/docker-network-disconnect.1.gz @@ -168,6 +173,16 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker-system.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-trust-inspect.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-key-generate.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-key-load.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-key.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-revoke.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-sign.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-signer-add.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-signer-remove.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust-signer.1.gz +-rw-r--r-- root/root usr/share/man/man1/docker-trust.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 diff --git a/docker/.md5sum b/docker/.md5sum index 2952a47e..aa0a099a 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,5 +1,5 @@ -e0df90392b2daa545562342dabf181cf docker-ce-v17.09.0-ce.tar.gz -c1c52ebce61e150955304cb9e5eb4193 docker-man-pages-17.09.0-ce.tar.xz +0964e6ff25308c4369684104347a77c8 docker-ce-v18.05.0-ce.tar.gz +8d12270929b231640528a597a3caeba6 docker-man-pages-18.05.0-ce.tar.xz 639d3af72199001bb612e545335a67a3 docker.conf d83f39cc5876fed6daecfbd28cfed4c1 docker.rc -301aa0330b9fbd1094fd4041afd21340 libnetwork-7b2b1fe.tar.xz +067c04ae44c9319269064ba23d6e530d libnetwork-c15b372.tar.xz diff --git a/docker/.signature b/docker/.signature index 9110d2de..fdfa9c4c 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32qc8hstFXp9NheVbmqHhYKl1UdqeIdZvlfDjSoEAV7qbvUIiejcIDB1VdnpksrCiUaq4pCfwjicRDt2njV+CAs= -SHA256 (Pkgfile) = 69222da3b1141c028eba4958aa74ee1d69daf86407ebf9766690c1d971ee9b9b -SHA256 (.footprint) = 07676e9b0f0e9f22f814a78b98c2dd295bef5aeed8e7b3a3396ee2beddeab911 -SHA256 (docker-ce-v17.09.0-ce.tar.gz) = ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae -SHA256 (docker-man-pages-17.09.0-ce.tar.xz) = f9b08e0f65f45a7818c6df8701927def25709682f331bfa324fdf8e90f2d625c -SHA256 (libnetwork-7b2b1fe.tar.xz) = ba99d9d95f21357013d59f11caa0cd3b6cbae24881672a83fb26d30c02266d00 +RWSagIOpLGJF37kx+hcxqLzhGwar9rh5rBLuxqD/B7TEnQxvA18u00MwLKTBphsyylW0cJLZ9eBS0He5+Fgwh89dHeCrhG7Pdgk= +SHA256 (Pkgfile) = 754a3b3c368ea7047f46d06f6aa0ee2e31c4864819d3857ef2ab7158e8351f40 +SHA256 (.footprint) = 6f5f3e4fb0b6ba188e119036c15550db83354936d24a0d447abd0f0ffac91fa8 +SHA256 (docker-ce-v18.05.0-ce.tar.gz) = cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75 +SHA256 (docker-man-pages-18.05.0-ce.tar.xz) = 31342b5aff83447ba24da70b7ddcd4f0d9d4a57c2d724404042c8f628b36098c +SHA256 (libnetwork-c15b372.tar.xz) = 6e3b70eed616fe5a187dca3f3eb1e00497e34d4e9bc7bbd6ef6cd87356c3f9be SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index 522c0d0d..0b6a3842 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,16 +4,16 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=17.09.0-ce +version=18.05.0-ce release=1 source=(https://github.com/docker/docker-ce/archive/v$version/$name-ce-v$version.tar... \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ - http://jaeger.morpheus.net/linux/crux/files/libnetwork-7b2b1fe.tar.xz \ + http://jaeger.morpheus.net/linux/crux/files/libnetwork-c15b372.tar.xz \ $name.rc $name.conf) build() { export GOPATH=$SRC - export DOCKER_GITCOMMIT=afdb6d4 + export DOCKER_GITCOMMIT=f150324 export DOCKER_BUILDTAGS='seccomp' export DISABLE_WARN_OUTSIDE_CONTAINER=1 @@ -35,12 +35,12 @@ build() { cd $name-ce-$version install -D -m 0755 components/cli/build/$name $PKG/usr/bin/$name - install -D -m 0755 components/engine/bundles/$version/dynbinary-daemon/dockerd-$version \ + install -D -m 0755 components/engine/bundles/latest/dynbinary-daemon/dockerd-dev \ $PKG/usr/bin/dockerd (cd ..; \ GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ - libnetwork-7b2b1fe/cmd/proxy) + libnetwork-c15b372/cmd/proxy) for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M}