* [PR PATCH] Update container configuration files
@ 2024-07-30 19:59 cinerea0
2024-07-30 20:04 ` [PR PATCH] [Updated] " cinerea0
2024-07-31 13:01 ` [PR PATCH] [Merged]: " cinerea0
0 siblings, 2 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-30 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is a new pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages container-conf
https://github.com/void-linux/void-packages/pull/51556
Update container configuration files
#### Testing the changes
- I tested the changes in this PR: **YES**
Only running this through CI to make sure there are no file conflicts.
---
cc @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/51556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-container-conf-51556.patch --]
[-- Type: text/x-diff, Size: 4795 bytes --]
From 6a472d2eccd23bd510e0d56542f4208c67ca6d5d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 14:33:22 -0400
Subject: [PATCH 1/3] containers-common: update to 0.60.0
---
srcpkgs/containers-common/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/containers-common/template b/srcpkgs/containers-common/template
index ca8c0857986a6a..c8ac31767f8609 100644
--- a/srcpkgs/containers-common/template
+++ b/srcpkgs/containers-common/template
@@ -1,6 +1,6 @@
# Template file for 'containers-common'
pkgname=containers-common
-version=0.56.0
+version=0.60.0
revision=1
build_style=gnu-makefile
make_build_args="-C docs"
@@ -10,8 +10,9 @@ short_desc="Docs and configs shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/common"
-distfiles="https://github.com/containers/common/archive/v${version}.tar.gz"
-checksum=a981ff8746cf193fda0caccb9cd0deac121e334dfa0de6f441ad7ebb267f1109
+changelog="https://github.com/containers/common/releases"
+distfiles="https://github.com/containers/common/archive/refs/tags/v${version}.tar.gz"
+checksum=c9f9a2ba78c69234b78d4b168bb2f70e3459e66d7931e68fde449af9b52e0062
post_install() {
vinstall pkg/seccomp/seccomp.json 0644 usr/share/containers
From a23dba1c5694a76cb2078d2681dcbde048357845 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 14:33:42 -0400
Subject: [PATCH 2/3] containers.image: update to 5.32.0
---
srcpkgs/containers.image/files/policy.json | 16 ----------------
srcpkgs/containers.image/template | 9 +++++----
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/containers.image/files/policy.json
diff --git a/srcpkgs/containers.image/files/policy.json b/srcpkgs/containers.image/files/policy.json
deleted file mode 100644
index d8c638a0c27572..00000000000000
--- a/srcpkgs/containers.image/files/policy.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "default": [
- {
- "type": "insecureAcceptAnything"
- }
- ],
- "transports": {
- "docker-daemon": {
- "": [
- {
- "type": "insecureAcceptAnything"
- }
- ]
- }
- }
-}
diff --git a/srcpkgs/containers.image/template b/srcpkgs/containers.image/template
index 93c92c944d217c..f76fb184d0a400 100644
--- a/srcpkgs/containers.image/template
+++ b/srcpkgs/containers.image/template
@@ -1,6 +1,6 @@
# Template file for 'containers.image'
pkgname=containers.image
-version=5.28.0
+version=5.32.0
revision=1
conf_files="/etc/containers/registries.conf /etc/containers/policy.json"
hostmakedepends="go-md2man"
@@ -8,8 +8,9 @@ short_desc="Configuration shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/image"
-distfiles="https://github.com/containers/image/archive/v${version}.tar.gz"
-checksum=89f0aa574f65b1849c57ed2be660fac2cbaec5f43e2e14cdfebb3ff15556fd78
+distfiles="https://github.com/containers/image/archive/refs/tags/v${version}.tar.gz"
+changelog="https://github.com/containers/image/releases"
+checksum=f7582d2b4fed4967921ff154752cc33e8f319a232b561710a3e2872ba754945d
do_build() {
mkdir -p build
@@ -24,5 +25,5 @@ do_install() {
vman "${man}"
done
vinstall registries.conf 0644 etc/containers
- vinstall "${FILESDIR}/policy.json" 0644 etc/containers
+ vinstall default-policy.json 0644 etc/containers policy.json
}
From bd4564a4622742f1bc632d583921a6bb8c54db05 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 14:33:57 -0400
Subject: [PATCH 3/3] containers.storage: update to 1.55.0
---
srcpkgs/containers.storage/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/containers.storage/template b/srcpkgs/containers.storage/template
index b2ab08ff1fb611..9814ccb409bec5 100644
--- a/srcpkgs/containers.storage/template
+++ b/srcpkgs/containers.storage/template
@@ -1,6 +1,6 @@
# Template file for 'containers.storage'
pkgname=containers.storage
-version=1.50.2
+version=1.55.0
revision=1
hostmakedepends="go-md2man"
depends="fuse-overlayfs"
@@ -8,8 +8,9 @@ short_desc="Storage configuration shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/storage"
+changelog="https://github.com/containers/storage/releases"
distfiles="https://github.com/containers/storage/archive/refs/tags/v${version}.tar.gz"
-checksum=8ed20cea8cd9bb6ecb63220a0b3f32df63445fe06fb8074c50e3c942e7d1ca0f
+checksum=d6c2d3af9e0f674c248477d521d0f8fc5eac050c65e2fd3f823cc42502b22847
_manpage="containers-storage.conf.5"
do_build() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Update container configuration files
2024-07-30 19:59 [PR PATCH] Update container configuration files cinerea0
@ 2024-07-30 20:04 ` cinerea0
2024-07-31 13:01 ` [PR PATCH] [Merged]: " cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-30 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages container-conf
https://github.com/void-linux/void-packages/pull/51556
Update container configuration files
#### Testing the changes
- I tested the changes in this PR: **YES**
Only running this through CI to make sure there are no file conflicts.
---
cc @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/51556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-container-conf-51556.patch --]
[-- Type: text/x-diff, Size: 4795 bytes --]
From 9ccc7e74d5c9c894b80584ff17bd82210e7b9c12 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 16:04:04 -0400
Subject: [PATCH 1/3] containers-common: update to 0.60.0
---
srcpkgs/containers-common/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/containers-common/template b/srcpkgs/containers-common/template
index ca8c0857986a6a..c8ac31767f8609 100644
--- a/srcpkgs/containers-common/template
+++ b/srcpkgs/containers-common/template
@@ -1,6 +1,6 @@
# Template file for 'containers-common'
pkgname=containers-common
-version=0.56.0
+version=0.60.0
revision=1
build_style=gnu-makefile
make_build_args="-C docs"
@@ -10,8 +10,9 @@ short_desc="Docs and configs shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/common"
-distfiles="https://github.com/containers/common/archive/v${version}.tar.gz"
-checksum=a981ff8746cf193fda0caccb9cd0deac121e334dfa0de6f441ad7ebb267f1109
+changelog="https://github.com/containers/common/releases"
+distfiles="https://github.com/containers/common/archive/refs/tags/v${version}.tar.gz"
+checksum=c9f9a2ba78c69234b78d4b168bb2f70e3459e66d7931e68fde449af9b52e0062
post_install() {
vinstall pkg/seccomp/seccomp.json 0644 usr/share/containers
From 3ae545663f5862b54aa5a6957e207a742d971aca Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 16:04:17 -0400
Subject: [PATCH 2/3] containers.image: update to 5.32.0
---
srcpkgs/containers.image/files/policy.json | 16 ----------------
srcpkgs/containers.image/template | 9 +++++----
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/containers.image/files/policy.json
diff --git a/srcpkgs/containers.image/files/policy.json b/srcpkgs/containers.image/files/policy.json
deleted file mode 100644
index d8c638a0c27572..00000000000000
--- a/srcpkgs/containers.image/files/policy.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "default": [
- {
- "type": "insecureAcceptAnything"
- }
- ],
- "transports": {
- "docker-daemon": {
- "": [
- {
- "type": "insecureAcceptAnything"
- }
- ]
- }
- }
-}
diff --git a/srcpkgs/containers.image/template b/srcpkgs/containers.image/template
index 93c92c944d217c..75e69886a11f6f 100644
--- a/srcpkgs/containers.image/template
+++ b/srcpkgs/containers.image/template
@@ -1,6 +1,6 @@
# Template file for 'containers.image'
pkgname=containers.image
-version=5.28.0
+version=5.32.0
revision=1
conf_files="/etc/containers/registries.conf /etc/containers/policy.json"
hostmakedepends="go-md2man"
@@ -8,8 +8,9 @@ short_desc="Configuration shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/image"
-distfiles="https://github.com/containers/image/archive/v${version}.tar.gz"
-checksum=89f0aa574f65b1849c57ed2be660fac2cbaec5f43e2e14cdfebb3ff15556fd78
+changelog="https://github.com/containers/image/releases"
+distfiles="https://github.com/containers/image/archive/refs/tags/v${version}.tar.gz"
+checksum=f7582d2b4fed4967921ff154752cc33e8f319a232b561710a3e2872ba754945d
do_build() {
mkdir -p build
@@ -24,5 +25,5 @@ do_install() {
vman "${man}"
done
vinstall registries.conf 0644 etc/containers
- vinstall "${FILESDIR}/policy.json" 0644 etc/containers
+ vinstall default-policy.json 0644 etc/containers policy.json
}
From d625f386622ca41cbc6812c1a40358279f39a6eb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 Jul 2024 16:04:32 -0400
Subject: [PATCH 3/3] containers.storage: update to 1.55.0
---
srcpkgs/containers.storage/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/containers.storage/template b/srcpkgs/containers.storage/template
index b2ab08ff1fb611..9814ccb409bec5 100644
--- a/srcpkgs/containers.storage/template
+++ b/srcpkgs/containers.storage/template
@@ -1,6 +1,6 @@
# Template file for 'containers.storage'
pkgname=containers.storage
-version=1.50.2
+version=1.55.0
revision=1
hostmakedepends="go-md2man"
depends="fuse-overlayfs"
@@ -8,8 +8,9 @@ short_desc="Storage configuration shared by podman, buildah, and skopeo"
maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/containers/storage"
+changelog="https://github.com/containers/storage/releases"
distfiles="https://github.com/containers/storage/archive/refs/tags/v${version}.tar.gz"
-checksum=8ed20cea8cd9bb6ecb63220a0b3f32df63445fe06fb8074c50e3c942e7d1ca0f
+checksum=d6c2d3af9e0f674c248477d521d0f8fc5eac050c65e2fd3f823cc42502b22847
_manpage="containers-storage.conf.5"
do_build() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Update container configuration files
2024-07-30 19:59 [PR PATCH] Update container configuration files cinerea0
2024-07-30 20:04 ` [PR PATCH] [Updated] " cinerea0
@ 2024-07-31 13:01 ` cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-31 13:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There's a merged pull request on the void-packages repository
Update container configuration files
https://github.com/void-linux/void-packages/pull/51556
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
Only running this through CI to make sure there are no file conflicts.
---
cc @CameronNemo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-31 13:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-30 19:59 [PR PATCH] Update container configuration files cinerea0
2024-07-30 20:04 ` [PR PATCH] [Updated] " cinerea0
2024-07-31 13:01 ` [PR PATCH] [Merged]: " cinerea0
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).