From b2303d20e9f382b1454b664fec8ed0abd7059e6d Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 16 May 2026 22:33:14 +1000 Subject: [PATCH] feat: add fedora rpmbuilder images (#48) - bump base images - add buildah to rpmbuilder images - add fedora 42, 43 and 44 rpmbuilder images Reviewed-on: https://git.unkin.net/unkin/packer-images/pulls/48 --- images/almalinux/8.10/base/builds | 1 - .../base/files/etc/yum.repos.d/unkin.repo | 4 +- .../base/files/etc/yum.repos.d/unkinben.repo | 4 +- .../8.10/base/variables.auto.pkrvars.hcl | 2 +- images/almalinux/8.10/base/version | 2 +- .../rpmbuilder/variables.auto.pkrvars.hcl | 1 + images/almalinux/9.7/base/builds | 1 - .../9.7/base/files/etc/yum.repos.d/unkin.repo | 4 +- .../9.7/base/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/base/version | 2 +- .../9.7/rpmbuilder/variables.auto.pkrvars.hcl | 1 + images/almalinux/9.7/rpmbuilder/version | 2 +- .../fedora/42/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/42/rpmbuilder/builds | 1 + .../42/rpmbuilder/variables.auto.pkrvars.hcl | 47 +++++++++++++++++++ images/fedora/42/rpmbuilder/version | 1 + .../fedora/43/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/43/rpmbuilder/builds | 1 + .../43/rpmbuilder/variables.auto.pkrvars.hcl | 47 +++++++++++++++++++ images/fedora/43/rpmbuilder/version | 1 + .../fedora/44/base/variables.auto.pkrvars.hcl | 2 +- images/fedora/44/rpmbuilder/builds | 1 + .../44/rpmbuilder/variables.auto.pkrvars.hcl | 47 +++++++++++++++++++ images/fedora/44/rpmbuilder/version | 1 + 24 files changed, 163 insertions(+), 16 deletions(-) create mode 100644 images/fedora/42/rpmbuilder/builds create mode 100644 images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl create mode 100644 images/fedora/42/rpmbuilder/version create mode 100644 images/fedora/43/rpmbuilder/builds create mode 100644 images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl create mode 100644 images/fedora/43/rpmbuilder/version create mode 100644 images/fedora/44/rpmbuilder/builds create mode 100644 images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl create mode 100644 images/fedora/44/rpmbuilder/version diff --git a/images/almalinux/8.10/base/builds b/images/almalinux/8.10/base/builds index 4ff1840..bdb9670 100644 --- a/images/almalinux/8.10/base/builds +++ b/images/almalinux/8.10/base/builds @@ -1,2 +1 @@ docker -incus diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/unkin.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/unkin.repo index 75b52bc..a9dd214 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/unkin.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/unkin.repo @@ -1,6 +1,6 @@ [unkin] name=unkin repository -baseurl=https://git.query.consul/api/packages/unkin/rpm/almalinux/el8 -gpgkey=https://git.query.consul/api/packages/unkin/rpm/repository.key +baseurl=https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8 +gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key enabled=1 gpgcheck=0 diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/unkinben.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/unkinben.repo index 122b5df..f97b07d 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/unkinben.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/unkinben.repo @@ -1,7 +1,7 @@ # only available on EL8 [unkinben] name=unkinben repository -baseurl=https://git.query.consul/api/packages/unkinben/rpm/el8 -gpgkey=https://git.query.consul/api/packages/unkinben/rpm/repository.key +baseurl=https://git.unkin.net/api/packages/unkinben/rpm/el8 +gpgkey=https://git.unkin.net/api/packages/unkinben/rpm/repository.key enabled=1 gpgcheck=0 diff --git a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl index f3dedea..69f6f98 100644 --- a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl @@ -15,7 +15,7 @@ packages = [ ] scripts_pre_file_copy = [ "rm -f /etc/yum.repos.d/*.repo", - "curl -k -o internal-ca-certificates.rpm https://git.query.consul/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm" + "curl -k -o internal-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm" ] scripts_pre_packages = [ "dnf makecache", diff --git a/images/almalinux/8.10/base/version b/images/almalinux/8.10/base/version index 058cb29..8ee5b41 100644 --- a/images/almalinux/8.10/base/version +++ b/images/almalinux/8.10/base/version @@ -1 +1 @@ -20260117 +20260516 diff --git a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl index 0e2e814..18db303 100644 --- a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl @@ -6,6 +6,7 @@ packages = [ "automake", "binutils", "bison", + "buildah", "byacc", "cmake", "diffstat", diff --git a/images/almalinux/9.7/base/builds b/images/almalinux/9.7/base/builds index 4ff1840..bdb9670 100644 --- a/images/almalinux/9.7/base/builds +++ b/images/almalinux/9.7/base/builds @@ -1,2 +1 @@ docker -incus diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo index e44d97e..4f7d0c6 100644 --- a/images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo @@ -1,6 +1,6 @@ [unkin] name=unkin repository -baseurl=https://git.query.consul/api/packages/unkin/rpm/almalinux/el9 -gpgkey=https://git.query.consul/api/packages/unkin/rpm/repository.key +baseurl=https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9 +gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key enabled=1 gpgcheck=0 diff --git a/images/almalinux/9.7/base/variables.auto.pkrvars.hcl b/images/almalinux/9.7/base/variables.auto.pkrvars.hcl index 2f8de08..7dcc200 100644 --- a/images/almalinux/9.7/base/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/base/variables.auto.pkrvars.hcl @@ -16,7 +16,7 @@ packages = [ ] scripts_pre_file_copy = [ "rm -f /etc/yum.repos.d/*.repo", - "curl -k -o internal-ca-certificates.rpm https://git.query.consul/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm" + "curl -k -o internal-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/internal-ca-certificates/20240825-1.el8/files/756 && rpm -i internal-ca-certificates.rpm" ] scripts_pre_packages = [ "dnf makecache", diff --git a/images/almalinux/9.7/base/version b/images/almalinux/9.7/base/version index 1f662c8..8ee5b41 100644 --- a/images/almalinux/9.7/base/version +++ b/images/almalinux/9.7/base/version @@ -1 +1 @@ -20260325 +20260516 diff --git a/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl index b5a902a..3e97145 100644 --- a/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl @@ -6,6 +6,7 @@ packages = [ "automake", "binutils", "bison", + "buildah", "byacc", "cmake", "diffstat", diff --git a/images/almalinux/9.7/rpmbuilder/version b/images/almalinux/9.7/rpmbuilder/version index be1b8db..8ee5b41 100644 --- a/images/almalinux/9.7/rpmbuilder/version +++ b/images/almalinux/9.7/rpmbuilder/version @@ -1 +1 @@ -20260308 +20260516 diff --git a/images/fedora/42/base/variables.auto.pkrvars.hcl b/images/fedora/42/base/variables.auto.pkrvars.hcl index d62cd21..b2c8f99 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 -k -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/files/12294 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/42/rpmbuilder/builds b/images/fedora/42/rpmbuilder/builds new file mode 100644 index 0000000..bdb9670 --- /dev/null +++ b/images/fedora/42/rpmbuilder/builds @@ -0,0 +1 @@ +docker diff --git a/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl new file mode 100644 index 0000000..fe67dea --- /dev/null +++ b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl @@ -0,0 +1,47 @@ +# almalinux/9.7/rpmbuilder +docker_source = "git.unkin.net/unkin/fedora42-base:latest" +packages = [ + "asciidoc", + "autoconf", + "automake", + "binutils", + "bison", + "buildah", + "byacc", + "cmake", + "diffstat", + "flex", + "gcc", + "gcc-c++", + "gdb", + "glibc-devel", + "go", + "gzip", + "intltool", + "jna", + "ltrace", + #"nfpm", + "patchutils", + "perl-Fedora-VSP", + "perl-generators", + "pesign", + "pkgconf", + "pkgconf-m4", + "pkgconf-pkg-config", + "redhat-rpm-config", + "rpm", + "rpm-build", + "rpm-sign", + "rpmdevtools", + "rpmlint", + "source-highlight", + "strace", + "systemtap", + "tar", + "valgrind", + "valgrind-devel", +] +scripts_final = [ + "dnf clean all", + "rm -rf /var/cache/dnf" +] diff --git a/images/fedora/42/rpmbuilder/version b/images/fedora/42/rpmbuilder/version new file mode 100644 index 0000000..be1b8db --- /dev/null +++ b/images/fedora/42/rpmbuilder/version @@ -0,0 +1 @@ +20260308 diff --git a/images/fedora/43/base/variables.auto.pkrvars.hcl b/images/fedora/43/base/variables.auto.pkrvars.hcl index 5ce60b0..44db7a2 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 -k -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/files/12294 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/43/rpmbuilder/builds b/images/fedora/43/rpmbuilder/builds new file mode 100644 index 0000000..bdb9670 --- /dev/null +++ b/images/fedora/43/rpmbuilder/builds @@ -0,0 +1 @@ +docker diff --git a/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl new file mode 100644 index 0000000..2a4a2e7 --- /dev/null +++ b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl @@ -0,0 +1,47 @@ +# almalinux/9.7/rpmbuilder +docker_source = "git.unkin.net/unkin/fedora43-base:latest" +packages = [ + "asciidoc", + "autoconf", + "automake", + "binutils", + "bison", + "buildah", + "byacc", + "cmake", + "diffstat", + "flex", + "gcc", + "gcc-c++", + "gdb", + "glibc-devel", + "go", + "gzip", + "intltool", + "jna", + "ltrace", + #"nfpm", + "patchutils", + "perl-Fedora-VSP", + "perl-generators", + "pesign", + "pkgconf", + "pkgconf-m4", + "pkgconf-pkg-config", + "redhat-rpm-config", + "rpm", + "rpm-build", + "rpm-sign", + "rpmdevtools", + "rpmlint", + "source-highlight", + "strace", + "systemtap", + "tar", + "valgrind", + "valgrind-devel", +] +scripts_final = [ + "dnf clean all", + "rm -rf /var/cache/dnf" +] diff --git a/images/fedora/43/rpmbuilder/version b/images/fedora/43/rpmbuilder/version new file mode 100644 index 0000000..be1b8db --- /dev/null +++ b/images/fedora/43/rpmbuilder/version @@ -0,0 +1 @@ +20260308 diff --git a/images/fedora/44/base/variables.auto.pkrvars.hcl b/images/fedora/44/base/variables.auto.pkrvars.hcl index 1f3741b..6c58543 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 -k -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/files/12294 && rpm -i unkin-ca-certificates.rpm", ] packages = [ "git", diff --git a/images/fedora/44/rpmbuilder/builds b/images/fedora/44/rpmbuilder/builds new file mode 100644 index 0000000..bdb9670 --- /dev/null +++ b/images/fedora/44/rpmbuilder/builds @@ -0,0 +1 @@ +docker diff --git a/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl new file mode 100644 index 0000000..7be3c20 --- /dev/null +++ b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl @@ -0,0 +1,47 @@ +# almalinux/9.7/rpmbuilder +docker_source = "git.unkin.net/unkin/fedora44-base:latest" +packages = [ + "asciidoc", + "autoconf", + "automake", + "binutils", + "bison", + "buildah", + "byacc", + "cmake", + "diffstat", + "flex", + "gcc", + "gcc-c++", + "gdb", + "glibc-devel", + "go", + "gzip", + "intltool", + "jna", + "ltrace", + #"nfpm", + "patchutils", + "perl-Fedora-VSP", + "perl-generators", + "pesign", + "pkgconf", + "pkgconf-m4", + "pkgconf-pkg-config", + "redhat-rpm-config", + "rpm", + "rpm-build", + "rpm-sign", + "rpmdevtools", + "rpmlint", + "source-highlight", + "strace", + "systemtap", + "tar", + "valgrind", + "valgrind-devel", +] +scripts_final = [ + "dnf clean all", + "rm -rf /var/cache/dnf" +] diff --git a/images/fedora/44/rpmbuilder/version b/images/fedora/44/rpmbuilder/version new file mode 100644 index 0000000..be1b8db --- /dev/null +++ b/images/fedora/44/rpmbuilder/version @@ -0,0 +1 @@ +20260308