diff options
| author | Hugo Osvaldo Barrera <hugo@whynothugo.nl> | 2024-05-02 14:55:33 +0200 |
|---|---|---|
| committer | Jake Buchholz Göktürk <tomalok@gmail.com> | 2024-05-04 14:54:31 +0000 |
| commit | 660be735bca7969bf59e91e15c8b2a3a100f8160 (patch) | |
| tree | dd528e698145f6311a962169097f23be0436e9e4 | |
| parent | cbf73556b7dec1aa63ca7f4ee87307089a00b8ef (diff) | |
community/docker-rootless-extras: merge into docker
The tarball for docker already contains this file. They have releases on
the same schedule and are shipped as one from upstream.
| -rw-r--r-- | community/docker-rootless-extras/APKBUILD | 24 | ||||
| -rw-r--r-- | community/docker/APKBUILD | 13 | ||||
| -rw-r--r-- | community/docker/docker-rootless-extras.conf (renamed from community/docker-rootless-extras/docker-rootless-extras.conf) | 0 |
3 files changed, 13 insertions, 24 deletions
diff --git a/community/docker-rootless-extras/APKBUILD b/community/docker-rootless-extras/APKBUILD deleted file mode 100644 index d8a2e25467a..00000000000 --- a/community/docker-rootless-extras/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> -pkgname=docker-rootless-extras -pkgver=25.0.3 -pkgrel=0 -pkgdesc="Extras to run docker as in rootless mode" -url="https://docs.docker.com/engine/security/rootless/" -arch="noarch" -license="Apache-2.0" -depends="docker rootlesskit slirp4netns fuse-overlayfs" -source=" - dockerd-rootless-$pkgver.sh::https://raw.githubusercontent.com/moby/moby/v$pkgver/contrib/dockerd-rootless.sh - docker-rootless-extras.conf - " -options="!check" # just a script with no tests - -package() { - install -Dm755 "$srcdir/dockerd-rootless-$pkgver.sh" "$pkgdir/usr/bin/dockerd-rootless" - install -Dm644 "$srcdir/docker-rootless-extras.conf" "$pkgdir/etc/modules-load.d/docker-rootless-extras.conf" -} - -sha512sums=" -a8229bc06ca831da18d20fa653a9b8645f1b3ac83051d249b2b33ae0f7af83dd50078c45aaedf69c86813da61be37254b784776c819648d3b4db9f251f51d0a0 dockerd-rootless-25.0.3.sh -45499bbd9d607cb782b014a2d5697d7279f327ac630accf249a13785d91e15fb0ba1ae2edc10b6b42fcf40b7ce23ef160a40d8cda17b3084d68fe8c54a84b8f4 docker-rootless-extras.conf -" diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD index c5335d68957..5043b33566e 100644 --- a/community/docker/APKBUILD +++ b/community/docker/APKBUILD @@ -69,6 +69,7 @@ subpackages=" $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion + $pkgname-rootless-extras:rootless " source=" @@ -76,6 +77,7 @@ source=" moby-$pkgver.tar.gz::https://github.com/moby/moby/archive/v$pkgver.tar.gz docker.initd docker.confd + docker-rootless-extras.conf " builddir="$srcdir" @@ -187,9 +189,20 @@ cli_doc() { install_if="docs $pkgname-cli=$pkgver-r$pkgrel" } +rootless() { + pkgdesc="Extras to run docker as in rootless mode" + url="https://docs.docker.com/engine/security/rootless/" + arch="noarch" + depends="$pkgname rootlesskit slirp4netns fuse-overlayfs" + + install -Dm755 "$srcdir/moby-$pkgver/contrib/dockerd-rootless.sh" "$subpkgdir/usr/bin/dockerd-rootless" + install -Dm644 "$srcdir/docker-rootless-extras.conf" "$subpkgdir/etc/modules-load.d/docker-rootless-extras.conf" +} + sha512sums=" 2ed44dbab04b3a6c33b721f53fe87c3b52231e3eb9c0d9d98da7dfaebab3c0883917540d806e84f9bf9acea0b8de5484d43f278e42effa55dd47693ac2de82cf cli-26.1.1.tar.gz 78561ef91e32e178dce85398970beabbfd447476c682a6f6c5ff8da13eeb39132ec6a685de27a5b7d6d99e8225ca64841d803fa789f3d045c79d4a74caf40c14 moby-26.1.1.tar.gz dd499b92058fc4d7d19e0c9030b1f390f58ac40be423442732cb7d02067ed2e43c464511772a21d4f347ec34f037ddd00cc1243dc41c8ce85151ac6142611d61 docker.initd 43432a05e5776910d45364aee9070932aa89f70eb9e69d3b7ed8e17d9a70eaed4c8c29b3524888214c7ddba592399e781a72255f7eb8fafd80c9f532a9481fac docker.confd +45499bbd9d607cb782b014a2d5697d7279f327ac630accf249a13785d91e15fb0ba1ae2edc10b6b42fcf40b7ce23ef160a40d8cda17b3084d68fe8c54a84b8f4 docker-rootless-extras.conf " diff --git a/community/docker-rootless-extras/docker-rootless-extras.conf b/community/docker/docker-rootless-extras.conf index fc2e5be0435..fc2e5be0435 100644 --- a/community/docker-rootless-extras/docker-rootless-extras.conf +++ b/community/docker/docker-rootless-extras.conf |