feat: upgrade to almalinux 9.7 (#33)

Reviewed-on: #33
2026-01-13 17:34:38 +11:00
parent 56a32bfaff
commit 944cc47e89
44 changed files with 52 additions and 54 deletions
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,26 @@
+# almalinux/9.7/actionsdind
+deploy_files_from_common = true
+include_incus_client_certs = true
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "bash",
+  "consul",
+  "docker-ce-cli",
+  "incus-client",
+  "incus-tools",
+  "nodejs",
+  "opentofu",
+  "packer",
+  "terragrunt",
+  "unzip",
+  "vault"
+]
+scripts_pre_packages = [
+  "dnf install -y yum-utils",
+  "dnf module enable -y nodejs:20",
+  "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,22 @@
+# almalinux/9.7/artifactapi
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "sudo"
+]
+scripts_post_packages = [
+  "git clone https://git.unkin.net/unkin/artifactapi.git /app/artifactapi && uv build --wheel /app/artifactapi",
+  "useradd -m -r -s /bin/sh appuser && chown -R appuser:appuser /app",
+  "sudo -u appuser uv tool install --from /app/artifactapi/dist/*.whl artifactapi",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
+docker_changes = [
+  "EXPOSE 8000",
+  "HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD curl -f http://localhost:8000/health || exit 1",
+  "USER appuser",
+  "ENV PATH=\"/home/appuser/.local/bin:$PATH\"",
+  "WORKDIR /app",
+  "CMD [\"artifactapi\"]"
+]
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1,2 @@
+docker
+incus
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +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
+enabled=1
+gpgcheck=0
@@ -0,0 +1,29 @@
+# almalinux/9.7/base
+deploy_files_from_image = true
+deploy_files_from_common = true
+use_incus = true
+packages = [
+  "git",
+  "jq",
+  "make",
+  "python3.11",
+  "python3.11-pip",
+  "python3.12",
+  "python3.12-pip",
+  "unkin-ca-certificates",
+  "uv",
+  "wget",
+]
+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"
+]
+scripts_pre_packages = [
+  "dnf makecache",
+  "dnf update -y",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
+
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,26 @@
+# almalinux/9.7/jupyterlab
+deploy_files_from_common = true
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+scripts_pre_file_copy = [
+  "dnf install -y sudo",
+]
+scripts_post_packages = [
+  "uv venv --python 3.12 /opt/jupyter && source /opt/jupyter/bin/activate && uv pip install -r /tmp/jupyter_requirements.txt && deactivate",
+  "uv venv --python 3.11 /opt/ipykernels/python3.11 && source /opt/ipykernels/python3.11/bin/activate && uv pip install ipykernel && python -m ipykernel install --name ipykernel311 --display-name \"Python (3.11)\" && deactivate",
+  "uv venv --python 3.12 /opt/ipykernels/python3.12 && source /opt/ipykernels/python3.12/bin/activate && uv pip install ipykernel && python -m ipykernel install --name ipykernel312 --display-name \"Python (3.12)\" && deactivate",
+  "uv venv --python 3.12 /opt/ipykernels/bash && source /opt/ipykernels/bash/bin/activate && uv pip install bash_kernel && python -m bash_kernel.install --prefix /usr/local && deactivate",
+  "uv venv --python 3.12 /opt/ipykernels/zsh && source /opt/ipykernels/zsh/bin/activate && uv pip install zsh_jupyter_kernel && python -m zsh_jupyter_kernel.install --prefix /usr/local && deactivate",
+  "uv venv --python 3.12 /opt/ipykernels/vim && source /opt/ipykernels/vim/bin/activate && uv pip install vim_kernel && python -m vim_kernel.install --prefix /usr/local && deactivate",
+  "useradd -m jupyter",
+  "mkdir /home/jupyter/work",
+  "chown jupyter:jupyter -Rv /home/jupyter/work"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
+docker_changes = [
+  "USER jupyter",
+  "WORKDIR /home/jupyter",
+  "CMD [\"/opt/jupyter/bin/jupyterhub-singleuser\"]",
+]
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,12 @@
+# almalinux/9.7/makerun
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "sudo"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
+docker_changes = [
+  "CMD /usr/local/bin/run.sh"
+]
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+incus
@@ -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
@@ -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
@@ -0,0 +1,19 @@
+# almalinux/9.7/puppet-base
+incus_source = "almalinux9/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"
+]
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,46 @@
+# almalinux/9.7/rpmbuilder
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "asciidoc",
+  "autoconf",
+  "automake",
+  "binutils",
+  "bison",
+  "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"
+]
@@ -0,0 +1 @@
+20260112