commit d74f2f14b100731ce3c5a1dfbe6be3dbf6810d5f Author: Matt Housh <jaeger@crux.ninja> Date: Tue Aug 28 11:44:06 2018 -0500 docker: updated to version 18.06.1-ce diff --git a/docker/.md5sum b/docker/.md5sum deleted file mode 100644 index aa0a099a..00000000 --- a/docker/.md5sum +++ /dev/null @@ -1,5 +0,0 @@ -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 -067c04ae44c9319269064ba23d6e530d libnetwork-c15b372.tar.xz diff --git a/docker/.signature b/docker/.signature index fdfa9c4c..30de6551 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37kx+hcxqLzhGwar9rh5rBLuxqD/B7TEnQxvA18u00MwLKTBphsyylW0cJLZ9eBS0He5+Fgwh89dHeCrhG7Pdgk= -SHA256 (Pkgfile) = 754a3b3c368ea7047f46d06f6aa0ee2e31c4864819d3857ef2ab7158e8351f40 +RWSagIOpLGJF3zKCIjLqyy+0LYCcx5fk4T9FNHPuzC0HmqyGeHOudQXLPKViz12Obk3wDSMAjAt+9i8bHzsJPwSNZRCsVLw3Zg8= +SHA256 (Pkgfile) = 1b54a07284ff7fcf9940fcb903d84273b7099d3cd14b0e9779f0df2101390f77 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-ce-v18.06.1-ce.tar.gz) = 153cb489033686260dfe7a42acbdd1753d56f7a9c2d7ad90633f0c8cce563b23 +SHA256 (docker-man-pages-18.06.1-ce.tar.xz) = 5c2e3960a539b148f724f8dec5852b270b5195305be280623be8b3f6cba01c4e +SHA256 (libnetwork-3ac297b.tar.xz) = 7959e74630383457f35813c1ac5c0d26ec8e42c2861df58c1dab1b0db0088d5a SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index 0b6a3842..891c1684 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,16 +4,16 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=18.05.0-ce +version=18.06.1-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-c15b372.tar.xz \ + http://jaeger.morpheus.net/linux/crux/files/libnetwork-3ac297b.tar.xz \ $name.rc $name.conf) build() { export GOPATH=$SRC - export DOCKER_GITCOMMIT=f150324 + export DOCKER_GITCOMMIT=e68fc7a export DOCKER_BUILDTAGS='seccomp' export DISABLE_WARN_OUTSIDE_CONTAINER=1 @@ -22,25 +22,25 @@ build() { pushd src/github.com/docker ln -s $SRC/$name-ce-$version/components/cli pushd cli - make dynbinary + make VERSION=$version dynbinary popd popd pushd src/github.com/docker ln -s $SRC/$name-ce-$version/components/engine $name pushd $name - hack/make.sh dynbinary + VERSION=$version hack/make.sh dynbinary popd popd cd $name-ce-$version install -D -m 0755 components/cli/build/$name $PKG/usr/bin/$name - install -D -m 0755 components/engine/bundles/latest/dynbinary-daemon/dockerd-dev \ + install -D -m 0755 components/engine/bundles/latest/dynbinary-daemon/dockerd-$version \ $PKG/usr/bin/dockerd (cd ..; \ GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ - libnetwork-c15b372/cmd/proxy) + libnetwork-3ac297b/cmd/proxy) for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M}