From 61cbcd73acbcf42230be4a3163c40405bac18beb Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Thu, 21 May 2026 22:24:57 +1000 Subject: [PATCH] feat: fedora repo (#49) - add fedora repo from git.unkin.net to images - add correct unkin-ca-certificates - add nfpm to rpmbuilder - bump base/rpmbuilder images Reviewed-on: https://git.unkin.net/unkin/packer-images/pulls/49 --- images/fedora/42/base/files/etc/yum.repos.d/unkin.repo | 6 ++++++ images/fedora/42/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/42/base/version | 2 +- images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl | 4 ++-- images/fedora/42/rpmbuilder/version | 2 +- images/fedora/43/base/files/etc/yum.repos.d/unkin.repo | 6 ++++++ images/fedora/43/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/43/base/version | 2 +- images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl | 4 ++-- images/fedora/43/rpmbuilder/version | 2 +- images/fedora/44/base/files/etc/yum.repos.d/unkin.repo | 6 ++++++ images/fedora/44/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl | 4 ++-- images/fedora/44/rpmbuilder/version | 2 +- 14 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 images/fedora/42/base/files/etc/yum.repos.d/unkin.repo create mode 100644 images/fedora/43/base/files/etc/yum.repos.d/unkin.repo create mode 100644 images/fedora/44/base/files/etc/yum.repos.d/unkin.repo diff --git a/images/fedora/42/base/files/etc/yum.repos.d/unkin.repo b/images/fedora/42/base/files/etc/yum.repos.d/unkin.repo new file mode 100644 index 0000000..c411554 --- /dev/null +++ b/images/fedora/42/base/files/etc/yum.repos.d/unkin.repo @@ -0,0 +1,6 @@ +[gitea-unkin-fedora-42] +name=Unkin Fedora 42 +baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/42 +enabled=1 +gpgcheck=1 +gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key diff --git a/images/fedora/42/base/variables.auto.pkrvars.hcl b/images/fedora/42/base/variables.auto.pkrvars.hcl index b2c8f99..dd3ef74 100644 --- a/images/fedora/42/base/variables.auto.pkrvars.hcl +++ b/images/fedora/42/base/variables.auto.pkrvars.hcl @@ -4,7 +4,7 @@ deploy_files_from_image = true deploy_files_from_common = false scripts_pre_file_copy = [ "rm -f /etc/yum.repos.d/*.repo", - "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm", + "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc42/files/15674 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/42/base/version b/images/fedora/42/base/version index a3ba0f5..49fefbb 100644 --- a/images/fedora/42/base/version +++ b/images/fedora/42/base/version @@ -1 +1 @@ -20260514 +20260521 diff --git a/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl index fe67dea..bda4180 100644 --- a/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.7/rpmbuilder +# fedora/42/rpmbuilder docker_source = "git.unkin.net/unkin/fedora42-base:latest" packages = [ "asciidoc", @@ -20,7 +20,7 @@ packages = [ "intltool", "jna", "ltrace", - #"nfpm", + "nfpm", "patchutils", "perl-Fedora-VSP", "perl-generators", diff --git a/images/fedora/42/rpmbuilder/version b/images/fedora/42/rpmbuilder/version index be1b8db..49fefbb 100644 --- a/images/fedora/42/rpmbuilder/version +++ b/images/fedora/42/rpmbuilder/version @@ -1 +1 @@ -20260308 +20260521 diff --git a/images/fedora/43/base/files/etc/yum.repos.d/unkin.repo b/images/fedora/43/base/files/etc/yum.repos.d/unkin.repo new file mode 100644 index 0000000..9acaae9 --- /dev/null +++ b/images/fedora/43/base/files/etc/yum.repos.d/unkin.repo @@ -0,0 +1,6 @@ +[gitea-unkin-fedora-43] +name=Unkin Fedora 43 +baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/43 +enabled=1 +gpgcheck=1 +gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key diff --git a/images/fedora/43/base/variables.auto.pkrvars.hcl b/images/fedora/43/base/variables.auto.pkrvars.hcl index 44db7a2..daf426b 100644 --- a/images/fedora/43/base/variables.auto.pkrvars.hcl +++ b/images/fedora/43/base/variables.auto.pkrvars.hcl @@ -4,7 +4,7 @@ deploy_files_from_image = true deploy_files_from_common = false scripts_pre_file_copy = [ "rm -f /etc/yum.repos.d/*.repo", - "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm", + "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc43/files/15602 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/43/base/version b/images/fedora/43/base/version index a3ba0f5..49fefbb 100644 --- a/images/fedora/43/base/version +++ b/images/fedora/43/base/version @@ -1 +1 @@ -20260514 +20260521 diff --git a/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl index 2a4a2e7..65ffedd 100644 --- a/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.7/rpmbuilder +# fedora/43/rpmbuilder docker_source = "git.unkin.net/unkin/fedora43-base:latest" packages = [ "asciidoc", @@ -20,7 +20,7 @@ packages = [ "intltool", "jna", "ltrace", - #"nfpm", + "nfpm", "patchutils", "perl-Fedora-VSP", "perl-generators", diff --git a/images/fedora/43/rpmbuilder/version b/images/fedora/43/rpmbuilder/version index be1b8db..49fefbb 100644 --- a/images/fedora/43/rpmbuilder/version +++ b/images/fedora/43/rpmbuilder/version @@ -1 +1 @@ -20260308 +20260521 diff --git a/images/fedora/44/base/files/etc/yum.repos.d/unkin.repo b/images/fedora/44/base/files/etc/yum.repos.d/unkin.repo new file mode 100644 index 0000000..c345fd2 --- /dev/null +++ b/images/fedora/44/base/files/etc/yum.repos.d/unkin.repo @@ -0,0 +1,6 @@ +[gitea-unkin-fedora-44] +name=Unkin Fedora 44 +baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/44 +enabled=1 +gpgcheck=1 +gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key diff --git a/images/fedora/44/base/variables.auto.pkrvars.hcl b/images/fedora/44/base/variables.auto.pkrvars.hcl index 6c58543..1f10453 100644 --- a/images/fedora/44/base/variables.auto.pkrvars.hcl +++ b/images/fedora/44/base/variables.auto.pkrvars.hcl @@ -4,7 +4,7 @@ deploy_files_from_image = true deploy_files_from_common = false scripts_pre_file_copy = [ "rm -f /etc/yum.repos.d/*.repo", - "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm", + "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc44/files/15656 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl index 7be3c20..66f6443 100644 --- a/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.7/rpmbuilder +# fedora/44/rpmbuilder docker_source = "git.unkin.net/unkin/fedora44-base:latest" packages = [ "asciidoc", @@ -20,7 +20,7 @@ packages = [ "intltool", "jna", "ltrace", - #"nfpm", + "nfpm", "patchutils", "perl-Fedora-VSP", "perl-generators", diff --git a/images/fedora/44/rpmbuilder/version b/images/fedora/44/rpmbuilder/version index be1b8db..49fefbb 100644 --- a/images/fedora/44/rpmbuilder/version +++ b/images/fedora/44/rpmbuilder/version @@ -1 +1 @@ -20260308 +20260521