diff options
| -rw-r--r-- | repos/extra/docker/.checksum | 4 | ||||
| -rw-r--r-- | repos/extra/docker/.files | 15 | ||||
| -rw-r--r-- | repos/extra/docker/abuild | 17 |
3 files changed, 8 insertions, 28 deletions
diff --git a/repos/extra/docker/.checksum b/repos/extra/docker/.checksum index 7e285412..5a887155 100644 --- a/repos/extra/docker/.checksum +++ b/repos/extra/docker/.checksum @@ -1,4 +1,4 @@ -8360105c2dacab5bd5191ef9177f65cc7e238c9caa049e5e116376124d944ad7 cli-v28.4.0.tar.gz +8f4e67796f1e85c59ab06bef02a94607c4eab45ad1e5f41f11be64f57f6cb515 cli-v29.2.1.tar.gz 02d796348f328c0386d08096d8cd8c48ae6b10fe7bf7bbdba3709a1940d6b30c dockerd.conf 197bab16338651c939c613cf27ab029b40670ba6d13a6ed3b2a7882334e2708b dockerd.run -00f9ef7a80ad6767bb97f6a048ffe479800226ad0a28856013b9366fc9783b17 moby-v28.4.0.tar.gz +426a5e9700d38b1fef4c88cb88a458a0bd4784e23ea253c20cf20b89a4b4ff23 moby-29.2.1.tar.gz diff --git a/repos/extra/docker/.files b/repos/extra/docker/.files index 58566f27..10dd74a6 100644 --- a/repos/extra/docker/.files +++ b/repos/extra/docker/.files @@ -4,9 +4,6 @@ drwxr-xr-x root/root etc/sv/dockerd/ -rw-r--r-- root/root etc/sv/dockerd/conf.new -rwxr-xr-x root/root etc/sv/dockerd/run.new lrwxrwxrwx root/root etc/sv/dockerd/supervise -> ../../../run/runit/supervise.dockerd -drwxr-xr-x root/root etc/udev/ -drwxr-xr-x root/root etc/udev/rules.d/ --rw-r--r-- root/root etc/udev/rules.d/80-docker.rules.new drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/docker @@ -20,8 +17,6 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/docker/ drwxr-xr-x root/root usr/lib/docker/cli-plugins/ 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 drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/docker-attach.1.gz @@ -191,16 +186,6 @@ 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/repos/extra/docker/abuild b/repos/extra/docker/abuild index 72f2ebdf..c3bf8761 100644 --- a/repos/extra/docker/abuild +++ b/repos/extra/docker/abuild @@ -1,12 +1,13 @@ name=docker -version=28.4.0 +version=29.2.1 release=2 source="https://github.com/${name}/cli/archive/v${version}/cli-v${version}.tar.gz - https://github.com/moby/moby/archive/v${version}/moby-v28.4.0.tar.gz + https://github.com/moby/moby/archive/docker-v${version}/moby-${version}.tar.gz dockerd.run dockerd.conf" sv="dockerd.run dockerd.conf" build() { + cd $SRC export GO111MODULE=auto export GOPATH=$SRC export DOCKER_GITCOMMIT=249d679 @@ -18,7 +19,6 @@ build() { export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw -ldflags=-linkmode=external" - cd $SRC mkdir -p src/github.com/docker cd src/github.com/docker ln -s $SRC/cli-$version cli @@ -27,15 +27,15 @@ build() { make manpages cd $SRC/src/github.com/docker - ln -s $SRC/moby-$version docker + ln -s $SRC/moby-docker-v$version docker cd docker VERSION=$version hack/make.sh dynbinary cd $SRC install -D -m 0755 cli-$version/build/$name $PKG/usr/bin/$name - install -D -m 0755 moby-$version/bundles/dynbinary-daemon/dockerd \ + install -D -m 0755 moby-docker-v$version/bundles/dynbinary-daemon/dockerd \ $PKG/usr/bin/dockerd - install -D -m 0755 moby-$version/bundles/dynbinary-daemon/docker-proxy \ + install -D -m 0755 moby-docker-v$version/bundles/dynbinary-daemon/docker-proxy \ $PKG/usr/bin/docker-proxy install -dm755 $PKG/usr/share/man @@ -46,10 +46,5 @@ build() { ln -s ctr $PKG/usr/bin/docker-containerd-ctr ln -s runc $PKG/usr/bin/docker-runc - install -D -m 0755 moby-$version/contrib/check-config.sh \ - $PKG/usr/share/$name/check-config.sh - install -D -m 0644 moby-$version/contrib/udev/80-$name.rules \ - $PKG/etc/udev/rules.d/80-$name.rules - mkdir -p $PKG/usr/lib/docker/cli-plugins } |