From 737888f098ff78df99ed5341a458f26c58529552 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 12 Jul 2025 12:22:23 +1000 Subject: [PATCH] feat: add almalinux8 incus images (#22) - build new base images for el8 and el9 - build puppet-base images for el8 and el9 Reviewed-on: https://git.unkin.net/unkin/packer-images/pulls/22 --- images/almalinux/8.10/base/builds | 1 + images/almalinux/8.10/base/version | 2 +- images/almalinux/8.10/puppet-base/builds | 1 + .../files/etc/skel/.config/htop/htoprc | 64 +++++++++++++++++++ .../files/etc/yum.repos.d/puppet.repo | 4 ++ .../puppet-base/variables.auto.pkrvars.hcl | 19 ++++++ images/almalinux/8.10/puppet-base/version | 1 + images/almalinux/9.6/base/version | 2 +- images/almalinux/9.6/puppet-base/version | 2 +- 9 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 images/almalinux/8.10/puppet-base/builds create mode 100644 images/almalinux/8.10/puppet-base/files/etc/skel/.config/htop/htoprc create mode 100644 images/almalinux/8.10/puppet-base/files/etc/yum.repos.d/puppet.repo create mode 100644 images/almalinux/8.10/puppet-base/variables.auto.pkrvars.hcl create mode 100644 images/almalinux/8.10/puppet-base/version diff --git a/images/almalinux/8.10/base/builds b/images/almalinux/8.10/base/builds index bdb9670..4ff1840 100644 --- a/images/almalinux/8.10/base/builds +++ b/images/almalinux/8.10/base/builds @@ -1 +1,2 @@ docker +incus diff --git a/images/almalinux/8.10/base/version b/images/almalinux/8.10/base/version index 800deb1..e177aad 100644 --- a/images/almalinux/8.10/base/version +++ b/images/almalinux/8.10/base/version @@ -1 +1 @@ -20250608 +20250712 diff --git a/images/almalinux/8.10/puppet-base/builds b/images/almalinux/8.10/puppet-base/builds new file mode 100644 index 0000000..3fdcd30 --- /dev/null +++ b/images/almalinux/8.10/puppet-base/builds @@ -0,0 +1 @@ +incus diff --git a/images/almalinux/8.10/puppet-base/files/etc/skel/.config/htop/htoprc b/images/almalinux/8.10/puppet-base/files/etc/skel/.config/htop/htoprc new file mode 100644 index 0000000..21f81f7 --- /dev/null +++ b/images/almalinux/8.10/puppet-base/files/etc/skel/.config/htop/htoprc @@ -0,0 +1,64 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +htop_version=3.3.0 +config_reader_min_version=3 +fields=0 48 17 18 38 39 40 2 46 47 49 1 +hide_kernel_threads=1 +hide_userland_threads=0 +hide_running_in_container=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=0 +highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +header_margin=1 +screen_tabs=1 +detailed_cpu_time=0 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +hide_function_bar=0 +topology_affinity=0 +header_layout=two_50_50 +column_meters_0=CPU Memory Swap DiskIO +column_meter_modes_0=1 1 1 2 +column_meters_1=Tasks LoadAverage Uptime NetworkIO +column_meter_modes_1=2 2 2 2 +tree_view=1 +sort_key=46 +tree_sort_key=0 +sort_direction=-1 +tree_sort_direction=1 +tree_view_always_by_pid=0 +all_branches_collapsed=0 +screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PERCENT_CPU +.tree_sort_key=PID +.tree_view_always_by_pid=0 +.tree_view=1 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 +screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view_always_by_pid=0 +.tree_view=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/images/almalinux/8.10/puppet-base/files/etc/yum.repos.d/puppet.repo b/images/almalinux/8.10/puppet-base/files/etc/yum.repos.d/puppet.repo new file mode 100644 index 0000000..ebeb5be --- /dev/null +++ b/images/almalinux/8.10/puppet-base/files/etc/yum.repos.d/puppet.repo @@ -0,0 +1,4 @@ +[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/8.10/puppet-base/variables.auto.pkrvars.hcl b/images/almalinux/8.10/puppet-base/variables.auto.pkrvars.hcl new file mode 100644 index 0000000..30d9858 --- /dev/null +++ b/images/almalinux/8.10/puppet-base/variables.auto.pkrvars.hcl @@ -0,0 +1,19 @@ +# almalinux/8.10/puppet-base +incus_source = "almalinux8/base/latest" +deploy_files_from_image = true +use_incus = true +packages = [ + "htop", + "openssh-server", + "puppet-agent", + "puppet-initial" +] +scripts_pre_packages = [ + "dnf makecache", + "dnf update -y", +] +scripts_final = [ + "dnf clean all", + "rm -rf /var/cache/dnf", + "systemctl enable sshd" +] diff --git a/images/almalinux/8.10/puppet-base/version b/images/almalinux/8.10/puppet-base/version new file mode 100644 index 0000000..e177aad --- /dev/null +++ b/images/almalinux/8.10/puppet-base/version @@ -0,0 +1 @@ +20250712 diff --git a/images/almalinux/9.6/base/version b/images/almalinux/9.6/base/version index 800deb1..e177aad 100644 --- a/images/almalinux/9.6/base/version +++ b/images/almalinux/9.6/base/version @@ -1 +1 @@ -20250608 +20250712 diff --git a/images/almalinux/9.6/puppet-base/version b/images/almalinux/9.6/puppet-base/version index 800deb1..e177aad 100644 --- a/images/almalinux/9.6/puppet-base/version +++ b/images/almalinux/9.6/puppet-base/version @@ -1 +1 @@ -20250608 +20250712