From 944cc47e891ae019a849c8d89dc4c8a073685777 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Tue, 13 Jan 2026 17:34:38 +1100 Subject: [PATCH] feat: upgrade to almalinux 9.7 (#33) Reviewed-on: https://git.unkin.net/unkin/packer-images/pulls/33 --- images/almalinux/9.6/actionsdind/version | 1 - images/almalinux/9.6/artifactapi/version | 1 - .../9.6/base/files/etc/yum.repos.d/appstream.repo | 6 ------ .../almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo | 6 ------ images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo | 7 ------- images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo | 6 ------ .../almalinux/9.6/base/files/etc/yum.repos.d/extras.repo | 6 ------ .../9.6/base/files/etc/yum.repos.d/highavailability.repo | 4 ---- images/almalinux/9.6/base/version | 1 - images/almalinux/9.6/jupyterlab/version | 1 - images/almalinux/9.6/makerun/version | 1 - .../9.6/puppet-base/files/etc/yum.repos.d/puppet.repo | 4 ---- images/almalinux/9.6/puppet-base/version | 1 - images/almalinux/9.6/rpmbuilder/version | 1 - images/almalinux/{9.6 => 9.7}/actionsdind/builds | 0 .../{9.6 => 9.7}/actionsdind/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/actionsdind/version | 1 + images/almalinux/{9.6 => 9.7}/artifactapi/builds | 0 .../{9.6 => 9.7}/artifactapi/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/artifactapi/version | 1 + images/almalinux/{9.6 => 9.7}/base/builds | 0 .../9.7/base/files/etc/yum.repos.d/appstream.repo | 6 ++++++ .../almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo | 6 ++++++ images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo | 7 +++++++ images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo | 6 ++++++ .../9.7/base/files/etc/yum.repos.d/highavailability.repo | 6 ++++++ .../{9.6 => 9.7}/base/files/etc/yum.repos.d/unkin.repo | 0 .../almalinux/{9.6 => 9.7}/base/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/base/version | 1 + images/almalinux/{9.6 => 9.7}/jupyterlab/builds | 0 .../{9.6 => 9.7}/jupyterlab/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/jupyterlab/version | 1 + images/almalinux/{9.6 => 9.7}/makerun/builds | 0 .../{9.6 => 9.7}/makerun/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/makerun/version | 1 + images/almalinux/{9.6 => 9.7}/puppet-base/builds | 0 .../puppet-base/files/etc/skel/.config/htop/htoprc | 0 .../9.7/puppet-base/files/etc/yum.repos.d/puppet.repo | 6 ++++++ .../{9.6 => 9.7}/puppet-base/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/puppet-base/version | 1 + images/almalinux/{9.6 => 9.7}/rpmbuilder/builds | 0 .../{9.6 => 9.7}/rpmbuilder/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.7/rpmbuilder/version | 1 + library/sources.pkr.hcl | 2 +- 44 files changed, 52 insertions(+), 54 deletions(-) delete mode 100644 images/almalinux/9.6/actionsdind/version delete mode 100644 images/almalinux/9.6/artifactapi/version delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo delete mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo delete mode 100644 images/almalinux/9.6/base/version delete mode 100644 images/almalinux/9.6/jupyterlab/version delete mode 100644 images/almalinux/9.6/makerun/version delete mode 100644 images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo delete mode 100644 images/almalinux/9.6/puppet-base/version delete mode 100644 images/almalinux/9.6/rpmbuilder/version rename images/almalinux/{9.6 => 9.7}/actionsdind/builds (100%) rename images/almalinux/{9.6 => 9.7}/actionsdind/variables.auto.pkrvars.hcl (95%) create mode 100644 images/almalinux/9.7/actionsdind/version rename images/almalinux/{9.6 => 9.7}/artifactapi/builds (100%) rename images/almalinux/{9.6 => 9.7}/artifactapi/variables.auto.pkrvars.hcl (96%) create mode 100644 images/almalinux/9.7/artifactapi/version rename images/almalinux/{9.6 => 9.7}/base/builds (100%) create mode 100644 images/almalinux/9.7/base/files/etc/yum.repos.d/appstream.repo create mode 100644 images/almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo create mode 100644 images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo create mode 100644 images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo create mode 100644 images/almalinux/9.7/base/files/etc/yum.repos.d/highavailability.repo rename images/almalinux/{9.6 => 9.7}/base/files/etc/yum.repos.d/unkin.repo (100%) rename images/almalinux/{9.6 => 9.7}/base/variables.auto.pkrvars.hcl (96%) create mode 100644 images/almalinux/9.7/base/version rename images/almalinux/{9.6 => 9.7}/jupyterlab/builds (100%) rename images/almalinux/{9.6 => 9.7}/jupyterlab/variables.auto.pkrvars.hcl (98%) create mode 100644 images/almalinux/9.7/jupyterlab/version rename images/almalinux/{9.6 => 9.7}/makerun/builds (100%) rename images/almalinux/{9.6 => 9.7}/makerun/variables.auto.pkrvars.hcl (89%) create mode 100644 images/almalinux/9.7/makerun/version rename images/almalinux/{9.6 => 9.7}/puppet-base/builds (100%) rename images/almalinux/{9.6 => 9.7}/puppet-base/files/etc/skel/.config/htop/htoprc (100%) create mode 100644 images/almalinux/9.7/puppet-base/files/etc/yum.repos.d/puppet.repo rename images/almalinux/{9.6 => 9.7}/puppet-base/variables.auto.pkrvars.hcl (92%) create mode 100644 images/almalinux/9.7/puppet-base/version rename images/almalinux/{9.6 => 9.7}/rpmbuilder/builds (100%) rename images/almalinux/{9.6 => 9.7}/rpmbuilder/variables.auto.pkrvars.hcl (96%) create mode 100644 images/almalinux/9.7/rpmbuilder/version diff --git a/images/almalinux/9.6/actionsdind/version b/images/almalinux/9.6/actionsdind/version deleted file mode 100644 index 94d087a..0000000 --- a/images/almalinux/9.6/actionsdind/version +++ /dev/null @@ -1 +0,0 @@ -20260106 diff --git a/images/almalinux/9.6/artifactapi/version b/images/almalinux/9.6/artifactapi/version deleted file mode 100644 index 762f0a8..0000000 --- a/images/almalinux/9.6/artifactapi/version +++ /dev/null @@ -1 +0,0 @@ -20260109 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo deleted file mode 100644 index 67f0e74..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo +++ /dev/null @@ -1,6 +0,0 @@ -[appstream] -name=appstream repository -baseurl=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo deleted file mode 100644 index 4bc0999..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo +++ /dev/null @@ -1,6 +0,0 @@ -[baseos] -name=baseos repository -baseurl=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo deleted file mode 100644 index 70298d9..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo +++ /dev/null @@ -1,7 +0,0 @@ -# new repo for EL9+, replaces PowerTools repo -[crb] -name=crb repository -baseurl=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo deleted file mode 100644 index abb3a97..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo +++ /dev/null @@ -1,6 +0,0 @@ -[epel] -name=epel repository -baseurl=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo deleted file mode 100644 index 21bf850..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo +++ /dev/null @@ -1,6 +0,0 @@ -[extras] -name=extras repository -baseurl=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo deleted file mode 100644 index 92ea6c5..0000000 --- a/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo +++ /dev/null @@ -1,4 +0,0 @@ -[ha] -name=ha repository -baseurl=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 diff --git a/images/almalinux/9.6/base/version b/images/almalinux/9.6/base/version deleted file mode 100644 index 94d087a..0000000 --- a/images/almalinux/9.6/base/version +++ /dev/null @@ -1 +0,0 @@ -20260106 diff --git a/images/almalinux/9.6/jupyterlab/version b/images/almalinux/9.6/jupyterlab/version deleted file mode 100644 index 800deb1..0000000 --- a/images/almalinux/9.6/jupyterlab/version +++ /dev/null @@ -1 +0,0 @@ -20250608 diff --git a/images/almalinux/9.6/makerun/version b/images/almalinux/9.6/makerun/version deleted file mode 100644 index 7eaabcd..0000000 --- a/images/almalinux/9.6/makerun/version +++ /dev/null @@ -1 +0,0 @@ -20260110_2 diff --git a/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo b/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo deleted file mode 100644 index ebeb5be..0000000 --- a/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo +++ /dev/null @@ -1,4 +0,0 @@ -[puppet] -name=puppet repository -baseurl=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/RPM-GPG-KEY-puppet-20250406 diff --git a/images/almalinux/9.6/puppet-base/version b/images/almalinux/9.6/puppet-base/version deleted file mode 100644 index e177aad..0000000 --- a/images/almalinux/9.6/puppet-base/version +++ /dev/null @@ -1 +0,0 @@ -20250712 diff --git a/images/almalinux/9.6/rpmbuilder/version b/images/almalinux/9.6/rpmbuilder/version deleted file mode 100644 index 94d087a..0000000 --- a/images/almalinux/9.6/rpmbuilder/version +++ /dev/null @@ -1 +0,0 @@ -20260106 diff --git a/images/almalinux/9.6/actionsdind/builds b/images/almalinux/9.7/actionsdind/builds similarity index 100% rename from images/almalinux/9.6/actionsdind/builds rename to images/almalinux/9.7/actionsdind/builds diff --git a/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl b/images/almalinux/9.7/actionsdind/variables.auto.pkrvars.hcl similarity index 95% rename from images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/actionsdind/variables.auto.pkrvars.hcl index 34ea06f..c0d54ab 100644 --- a/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/actionsdind/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.6/actionsdind +# almalinux/9.7/actionsdind deploy_files_from_common = true include_incus_client_certs = true docker_source = "git.unkin.net/unkin/almalinux9-base:latest" diff --git a/images/almalinux/9.7/actionsdind/version b/images/almalinux/9.7/actionsdind/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/actionsdind/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/artifactapi/builds b/images/almalinux/9.7/artifactapi/builds similarity index 100% rename from images/almalinux/9.6/artifactapi/builds rename to images/almalinux/9.7/artifactapi/builds diff --git a/images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl b/images/almalinux/9.7/artifactapi/variables.auto.pkrvars.hcl similarity index 96% rename from images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/artifactapi/variables.auto.pkrvars.hcl index 3a634e4..dcb2f04 100644 --- a/images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/artifactapi/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.6/rpmbuilder +# almalinux/9.7/artifactapi docker_source = "git.unkin.net/unkin/almalinux9-base:latest" packages = [ "sudo" diff --git a/images/almalinux/9.7/artifactapi/version b/images/almalinux/9.7/artifactapi/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/artifactapi/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/base/builds b/images/almalinux/9.7/base/builds similarity index 100% rename from images/almalinux/9.6/base/builds rename to images/almalinux/9.7/base/builds diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/appstream.repo new file mode 100644 index 0000000..f3d4698 --- /dev/null +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/appstream.repo @@ -0,0 +1,6 @@ +[appstream] +name=appstream repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/AppStream/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo new file mode 100644 index 0000000..ee6e2d1 --- /dev/null +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo @@ -0,0 +1,6 @@ +[baseos] +name=baseos repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/BaseOS/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo new file mode 100644 index 0000000..e51b408 --- /dev/null +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo @@ -0,0 +1,7 @@ +# new repo for EL9+, replaces PowerTools repo +[crb] +name=crb repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/CRB/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/CRB/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo new file mode 100644 index 0000000..54ac2dc --- /dev/null +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo @@ -0,0 +1,6 @@ +[epel] +name=epel repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/9/Everything/x86_64 +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.7/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/highavailability.repo new file mode 100644 index 0000000..9ab87c9 --- /dev/null +++ b/images/almalinux/9.7/base/files/etc/yum.repos.d/highavailability.repo @@ -0,0 +1,6 @@ +[ha] +name=ha repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/HighAvailability/x86_64/os +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/9.7/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo b/images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo similarity index 100% rename from images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo rename to images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo diff --git a/images/almalinux/9.6/base/variables.auto.pkrvars.hcl b/images/almalinux/9.7/base/variables.auto.pkrvars.hcl similarity index 96% rename from images/almalinux/9.6/base/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/base/variables.auto.pkrvars.hcl index 56537d3..2f8de08 100644 --- a/images/almalinux/9.6/base/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/base/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.6/base +# almalinux/9.7/base deploy_files_from_image = true deploy_files_from_common = true use_incus = true diff --git a/images/almalinux/9.7/base/version b/images/almalinux/9.7/base/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/base/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/jupyterlab/builds b/images/almalinux/9.7/jupyterlab/builds similarity index 100% rename from images/almalinux/9.6/jupyterlab/builds rename to images/almalinux/9.7/jupyterlab/builds diff --git a/images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl b/images/almalinux/9.7/jupyterlab/variables.auto.pkrvars.hcl similarity index 98% rename from images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/jupyterlab/variables.auto.pkrvars.hcl index ac9ac4e..a3808c8 100644 --- a/images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/jupyterlab/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.5/jupyterlab +# almalinux/9.7/jupyterlab deploy_files_from_common = true docker_source = "git.unkin.net/unkin/almalinux9-base:latest" scripts_pre_file_copy = [ diff --git a/images/almalinux/9.7/jupyterlab/version b/images/almalinux/9.7/jupyterlab/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/jupyterlab/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/makerun/builds b/images/almalinux/9.7/makerun/builds similarity index 100% rename from images/almalinux/9.6/makerun/builds rename to images/almalinux/9.7/makerun/builds diff --git a/images/almalinux/9.6/makerun/variables.auto.pkrvars.hcl b/images/almalinux/9.7/makerun/variables.auto.pkrvars.hcl similarity index 89% rename from images/almalinux/9.6/makerun/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/makerun/variables.auto.pkrvars.hcl index 46a8605..db01973 100644 --- a/images/almalinux/9.6/makerun/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/makerun/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.6/makerun +# almalinux/9.7/makerun docker_source = "git.unkin.net/unkin/almalinux9-base:latest" packages = [ "sudo" diff --git a/images/almalinux/9.7/makerun/version b/images/almalinux/9.7/makerun/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/makerun/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/puppet-base/builds b/images/almalinux/9.7/puppet-base/builds similarity index 100% rename from images/almalinux/9.6/puppet-base/builds rename to images/almalinux/9.7/puppet-base/builds diff --git a/images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc b/images/almalinux/9.7/puppet-base/files/etc/skel/.config/htop/htoprc similarity index 100% rename from images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc rename to images/almalinux/9.7/puppet-base/files/etc/skel/.config/htop/htoprc diff --git a/images/almalinux/9.7/puppet-base/files/etc/yum.repos.d/puppet.repo b/images/almalinux/9.7/puppet-base/files/etc/yum.repos.d/puppet.repo new file mode 100644 index 0000000..caa4a11 --- /dev/null +++ b/images/almalinux/9.7/puppet-base/files/etc/yum.repos.d/puppet.repo @@ -0,0 +1,6 @@ +[puppet] +name=puppet repository +baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/openvox/openvox7/el/9/x86_64 +gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/openvox/GPG-KEY-openvox.pub +enabled=1 +gpgcheck=1 \ No newline at end of file diff --git a/images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl b/images/almalinux/9.7/puppet-base/variables.auto.pkrvars.hcl similarity index 92% rename from images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/puppet-base/variables.auto.pkrvars.hcl index 2bb158d..61c67c7 100644 --- a/images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/puppet-base/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.5/puppet-base +# almalinux/9.7/puppet-base incus_source = "almalinux9/base/latest" deploy_files_from_image = true use_incus = true diff --git a/images/almalinux/9.7/puppet-base/version b/images/almalinux/9.7/puppet-base/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/puppet-base/version @@ -0,0 +1 @@ +20260112 diff --git a/images/almalinux/9.6/rpmbuilder/builds b/images/almalinux/9.7/rpmbuilder/builds similarity index 100% rename from images/almalinux/9.6/rpmbuilder/builds rename to images/almalinux/9.7/rpmbuilder/builds diff --git a/images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl similarity index 96% rename from images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl rename to images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl index 299d199..b5a902a 100644 --- a/images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl @@ -1,4 +1,4 @@ -# almalinux/9.6/rpmbuilder +# almalinux/9.7/rpmbuilder docker_source = "git.unkin.net/unkin/almalinux9-base:latest" packages = [ "asciidoc", diff --git a/images/almalinux/9.7/rpmbuilder/version b/images/almalinux/9.7/rpmbuilder/version new file mode 100644 index 0000000..13672a9 --- /dev/null +++ b/images/almalinux/9.7/rpmbuilder/version @@ -0,0 +1 @@ +20260112 diff --git a/library/sources.pkr.hcl b/library/sources.pkr.hcl index df5bea6..f0d3899 100644 --- a/library/sources.pkr.hcl +++ b/library/sources.pkr.hcl @@ -7,5 +7,5 @@ source "docker" "os" { source "incus" "os" { image = var.incus_source output_image = local.incus_output_image - profile = "build" + profile = ["build"] }