chore: bump artifactapi image

- includes unkin/artifactapi#8
feat: add gobuilder image (#44 )
2026-04-25 16:39:38 +10:00 · 2026-03-25 17:34:09 +11:00 · 2026-03-19 00:53:04 +11:00 · 2026-03-17 17:21:55 +11:00 · 2026-03-08 23:06:24 +11:00 · 2026-01-25 12:25:01 +11:00
72 changed files with 151 additions and 75 deletions
@@ -81,6 +81,7 @@ $(DIRS):
 	# Build the image
 	@(cd $(IMAGES_PATH)/$@ && \
 	export DATE=$(DATE_TAG) && \
+	export VERSION=$$(cat version) && \
 	export OS_NAME=$$(echo $@ | cut -d'/' -f1) && \
 	export OS_VERSION_FULL=$$(echo $@ | cut -d'/' -f2) && \
 	export OS_IMAGE=$$(echo $@ | cut -d'/' -f3) && \
@@ -64,7 +64,7 @@ build {
  post-processors {
    post-processor "docker-tag" {
      repository = "${var.docker_server}/unkin/${var.os_name}${var.os_version_major}-${var.os_image}"
-      tags = ["latest", var.date]
+      tags = ["latest", var.git_commit, var.version]
    }

    dynamic "post-processor" {
@@ -1 +1 @@
-20260106
+20260117
@@ -1,6 +1,6 @@
 [appstream]
 name=appstream repository
-baseurl=https://edgecache.query.consul/almalinux/8.10/AppStream/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [baseos]
 name=baseos repository
-baseurl=https://edgecache.query.consul/almalinux/8.10/BaseOS/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
 enabled=1
 gpgcheck=1
@@ -1,6 +1,6 @@
 [epel]
 name=epel repository
-baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/
-gpgkey=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-8
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/8/Everything/x86_64
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-8
 enabled=1
 gpgcheck=1
@@ -1,4 +0,0 @@
-[extras]
-name=extras repository
-baseurl=https://edgecache.query.consul/almalinux/8.10/extras/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
@@ -1,4 +1,6 @@
-[highavailability]
-name=highavailability repository
-baseurl=https://edgecache.query.consul/almalinux/8.10/HighAvailability/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
+[ha]
+name=ha repository
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-8
+enabled=1
+gpgcheck=1
@@ -1,7 +1,7 @@
 # replaced by crb repo in EL9
 [powertools]
 name=powertools repository
-baseurl=https://edgecache.query.consul/almalinux/8.10/PowerTools/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
+baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os
+gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux/8.10/PowerTools/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
@@ -1 +1 @@
-20260106
+20260117
@@ -1 +1 @@
-20250608
+20260117
@@ -1 +1 @@
-20260106
+20260117
@@ -1 +0,0 @@
-20260106
@@ -1 +0,0 @@
-20260110
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +0,0 @@
-20260106
@@ -1 +0,0 @@
-20250608
@@ -1 +0,0 @@
-20260110_2
@@ -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
@@ -1 +0,0 @@
-20250712
@@ -1 +0,0 @@
-20260106
@@ -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"
@@ -0,0 +1 @@
+20260112
@@ -1,4 +1,4 @@
-# almalinux/9.6/rpmbuilder
+# almalinux/9.7/artifactapi
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "sudo"
@@ -0,0 +1 @@
+2.1.0
@@ -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
@@ -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
@@ -0,0 +1 @@
+20260325
@@ -0,0 +1,12 @@
+# almalinux/9.7/makerun
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "g10k"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
+docker_changes = [
+  "CMD /usr/bin/g10k -config /etc/puppetlabs/r10k.yaml"
+]
@@ -0,0 +1 @@
+20260308
@@ -0,0 +1,10 @@
+# almalinux/9.7/gobuilder
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "go",
+  "nfpm"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
@@ -0,0 +1 @@
+20260325
@@ -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 = [
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,11 @@
+# almalinux/9.7/makerun
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "kubeconform",
+  "kustomize",
+  "helm-4.0.5-1"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
@@ -0,0 +1 @@
+20260319
@@ -0,0 +1 @@
+docker
@@ -1,4 +1,4 @@
-# almalinux/9.6/makerun
+# almalinux/9.7/makerun
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "sudo"
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,11 @@
+# almalinux/9.7/makerun
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "opentofu",
+  "tflint",
+  "terragrunt"
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
@@ -0,0 +1 @@
+20260308
@@ -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
@@ -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
@@ -0,0 +1 @@
+20260112
@@ -0,0 +1 @@
+docker
@@ -0,0 +1,20 @@
+# almalinux/9.7/puppet-validator
+docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
+packages = [
+  "rubygems",
+  "ruby-devel",
+  "gcc",
+  "make",
+  "redhat-rpm-config",
+  "glibc-headers",
+  "glibc-devel",
+  "libffi",
+  "libffi-devel"
+]
+scripts_pre_packages = [
+  "dnf -y group install \"Development Tools\""
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
@@ -0,0 +1 @@
+20260317
@@ -0,0 +1 @@
+docker
@@ -1,4 +1,4 @@
-# almalinux/9.6/rpmbuilder
+# almalinux/9.7/rpmbuilder
 docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
 packages = [
  "asciidoc",
@@ -0,0 +1 @@
+20260308
@@ -7,5 +7,5 @@ source "docker" "os" {
 source "incus" "os" {
  image = var.incus_source
  output_image = local.incus_output_image
-  profile = "build"
+  profile = ["build"]
 }
@@ -121,6 +121,11 @@ variable "git_branch" {
  type = string
  default = env("GIT_BRANCH")
 }
+variable "version" {
+  description = "The version from version file."
+  type = string
+  default = env("VERSION")
+}
 variable "include_incus_client_certs" {
  type    = bool
  default = false
Author	SHA1	Message	Date
unkinben	2e877214b6	chore: bump artifactapi image Build / build (pull_request) Successful in 48s Details - includes unkin/artifactapi#8	2026-04-25 16:39:38 +10:00
unkinben	3dde927ed7	feat: add gobuilder image (#44 ) Deploy / build (push) Successful in 2m34s Details - add gobuilder image for go related tasks - bump base image Reviewed-on: #44	2026-03-25 17:34:09 +11:00
unkinben	14682ceb9f	chore: lock helm to 4.0.5-1 (#43 ) Deploy / build (push) Successful in 50s Details rancher's helm chart requires helm with client version <1.35, helm 4.1.1 (default) supports 1.35. helm 4.0.5 supports 1.34 and below. hard-code kubetest to use helm 4.0.5 Reviewed-on: #43	2026-03-19 00:53:04 +11:00
unkinben	af824cdf22	feat: add puppet-pr-validator (#42 ) Deploy / build (push) Successful in 3m56s Details expanding puppet pr validation steps into multiple workflows, and removing the need to `dnf install` all these packages each workflow run would increase the performances. - add puppet-pr-validator container with pre-installed requirements for - bump base almalinux 9.7 image. Reviewed-on: #42	2026-03-17 17:21:55 +11:00
unkinben	c52952e2e9	feat: multi-purpose images (#41 ) Deploy / build (push) Successful in 5m31s Details - bump base almalinux 9.7 image - add opentofu image for testing terraform/terragrunt repos - add g10k image for puppet on kubernetes - add kubetest image for testing argocd ci Reviewed-on: #41	2026-03-08 23:06:24 +11:00
unkinben	4830421e43	benvin/artifactapi_2.0.5 (#40 ) Deploy / build (push) Successful in 39s Details Reviewed-on: #40	2026-01-25 12:25:01 +11:00
unkinben	b3f0b168fb	chore: bump artifactapi (#39 ) Deploy / build (push) Successful in 10s Details - change release tag to match the current version of artifactapi Reviewed-on: #39	2026-01-25 11:38:32 +11:00
unkinben	134c8a7265	chore: bump artifactapi (#38 ) Deploy / build (push) Successful in 33s Details Reviewed-on: #38	2026-01-25 00:05:28 +11:00
unkinben	3ae72ff5fc	chore: bump 8.10 images (#37 ) Deploy / build (push) Successful in 5m55s Details - followup from removing package repo, rebuild all 8.10 images Reviewed-on: #37	2026-01-17 16:48:37 +11:00
unkinben	82291583e8	feat: update el8 images to artifactapi (#36 ) Deploy / build (push) Successful in 1m52s Details - change repos for all 8.10 docker images to us artifactapi Reviewed-on: #36	2026-01-17 16:40:58 +11:00
unkinben	90773f1a52	artifactapi 2.0.2 (#35 ) Deploy / build (push) Successful in 50s Details Reviewed-on: #35	2026-01-13 19:05:18 +11:00
unkinben	f9eb1c66d1	bump artiactapi version (#34 ) Deploy / build (push) Successful in 59s Details Reviewed-on: #34	2026-01-13 18:16:28 +11:00
unkinben	944cc47e89	feat: upgrade to almalinux 9.7 (#33 ) Deploy / build (push) Successful in 9m29s Details Reviewed-on: #33	2026-01-13 17:34:38 +11:00