commit ccf51785e66af2c515a110255352c1ee1722bfe4 Author: Matt Housh <jaeger@crux.ninja> Date: Thu May 18 14:07:23 2023 -0500 docker: updated to version 24.0.0 diff --git a/docker/.footprint b/docker/.footprint index 1c449b8b6..4e55e752a 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -13,7 +13,6 @@ 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/ diff --git a/docker/.signature b/docker/.signature index aaa701125..626604b4a 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,10 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30WRK7z8RV7j+RmCoTR4ZVfZw2UVizHUE1/AFirDIi4DmLHWQmKyuA+7BuI4TwVM0Aic/1zBCtnQkPySlMapkgA= -SHA256 (Pkgfile) = b73f29e7860e495682f64335adcdf4f4f38d70f8213449e1c123e595b431f333 -SHA256 (.footprint) = 0a5c52f8aa7ee6269051c13f72c39496a44fc3256d25c9507daa9053a9b7c2aa -SHA256 (moby-23.0.6.tar.gz) = 3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e -SHA256 (cli-23.0.6.tar.gz) = b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9 -SHA256 (docker-man-pages-23.0.6.tar.xz) = ced3e4af9ed69133a232a47d7d2dbe90f43a923dfd3741a8b0ee5a08eef6368e -SHA256 (libnetwork-05b93e0.tar.xz) = 111b82905eefb7a8dd5311c30777a5680c7b1ad9fb362fcb45ca3c88aefcaf97 +RWSagIOpLGJF3zQfiokQZb6bCHmo2anR0tqElJSn4OJSN9ZZOOxCrP7dmVYHOswuoJEgy0GUVXjKemvxNaZD04b5arYsPcNsTgs= +SHA256 (Pkgfile) = c45828c06714d06cf03f93f5c2d69fa796a8118c485385e15856860e4ba7ebd7 +SHA256 (.footprint) = 9b2b7a941e8d0cd921cff1c841e82db47818caf59a65618562b11bf9376028ef +SHA256 (moby-24.0.0.tar.gz) = 62243fe5d1549cb106461ce4a144e81a18d9e2683051f9f6ec201f3ab4d90075 +SHA256 (cli-24.0.0.tar.gz) = 67260439687cc7f5135e93a6e566106db49791833190695d716f9116edb15d0f +SHA256 (docker-man-pages-24.0.0.tar.xz) = 8e315ec01d596210419718a7dc1ef9123372b1886a27654b38b42e8520b4276a SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = dd5ccd90bd1e8906d8ecf76dca062f8b4c837daeed765be155513dc34c2ee245 diff --git a/docker/Pkgfile b/docker/Pkgfile index 6e69f32c7..ee081d48a 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -3,21 +3,18 @@ # Maintainer: Matt Housh, jaeger at crux dot ninja # Depends on: containerd runc btrfs-progs cgroupfs-mount -# LIBNETWORK_COMMIT:=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7 - name=docker -version=23.0.6 +version=24.0.0 release=1 source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.tar.gz \ https://github.com/docker/cli/archive/v${version}/cli-${version}.tar.gz \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ - http://jaeger.morpheus.net/linux/crux/files/libnetwork-05b93e0.tar.xz \ $name.rc $name.conf) build() { export GO111MODULE=auto export GOPATH=$SRC - export DOCKER_GITCOMMIT=9dbdbd4 + export DOCKER_GITCOMMIT=1331b8c export DOCKER_BUILDTAGS='seccomp' export DISABLE_WARN_OUTSIDE_CONTAINER=1 export CGO_CFLAGS="${CFLAGS}" @@ -46,10 +43,6 @@ build() { install -D -m 0755 moby-$version/bundles/dynbinary-daemon/dockerd \ $PKG/usr/bin/dockerd - (cd ..; \ - GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ - libnetwork-05b93e0/cmd/proxy) - for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M} install -m 0644 $SRC/man${M}/* $PKG/usr/share/man/man${M}/