Compare commits

18 Commits

Author SHA1 Message Date
unkinben 5f3b2ebecd Merge pull request 'chore: bump almalinux 9.7 dependent image versions' (#52) from feat/almalinux-97-vault-repos-images into master
Deploy / build (push) Failing after 20m33s
2026-06-06 22:48:49 +10:00
unkinben 1b6d7edebf chore: bump almalinux 9.7 dependent image versions
Build / build (pull_request) Failing after 18m29s
2026-06-06 22:26:04 +10:00
unkinben 02c1648baa Merge pull request 'feat: switch almalinux 9.7 base image repos to almalinux-vault' (#51) from feat/almalinux-97-vault-repos-base into master
Deploy / build (push) Failing after 13m1s
2026-06-06 22:25:13 +10:00
unkinben 2814a83422 feat: switch almalinux 9.7 base image repos to almalinux-vault
Build / build (pull_request) Failing after 11m53s
2026-06-06 22:05:49 +10:00
unkinben 61cbcd73ac feat: fedora repo (#49)
Deploy / build (push) Successful in 3m27s
- add fedora repo from git.unkin.net to images
- add correct unkin-ca-certificates
- add nfpm to rpmbuilder
- bump base/rpmbuilder images

Reviewed-on: #49
2026-05-21 22:24:57 +10:00
unkinben b2303d20e9 feat: add fedora rpmbuilder images (#48)
Deploy / build (push) Successful in 19m28s
- bump base images
- add buildah to rpmbuilder images
- add fedora 42, 43 and 44 rpmbuilder images

Reviewed-on: #48
2026-05-16 22:33:14 +10:00
unkinben 6a5d89c61a feat: add fedora base images (#47)
Deploy / build (push) Successful in 2m41s
add fedora/42, fedora/43, fedora/44

Reviewed-on: #47
2026-05-15 00:13:04 +10:00
unkinben bdadd646bc chore: bump artifactapi 2.1.2 (#46)
Deploy / build (push) Successful in 39s
Reviewed-on: #46
2026-04-25 18:20:41 +10:00
unkinben df6be51375 chore: bump artifactapi image (#45)
Deploy / build (push) Successful in 41s
- includes unkin/artifactapi#8

Reviewed-on: #45
2026-04-25 17:36:29 +10:00
unkinben 3dde927ed7 feat: add gobuilder image (#44)
Deploy / build (push) Successful in 2m34s
- 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
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
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
- 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
Reviewed-on: #40
2026-01-25 12:25:01 +11:00
unkinben b3f0b168fb chore: bump artifactapi (#39)
Deploy / build (push) Successful in 10s
- 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
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
- 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
- change repos for all 8.10 docker images to us artifactapi

Reviewed-on: #36
2026-01-17 16:40:58 +11:00
68 changed files with 388 additions and 29 deletions
+1
View File
@@ -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) && \
+1 -1
View File
@@ -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
View File
@@ -1 +1 @@
20260106
20260117
-1
View File
@@ -1,2 +1 @@
docker
incus
@@ -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
@@ -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
@@ -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",
+1 -1
View File
@@ -1 +1 @@
20260117
20260516
+1 -1
View File
@@ -1 +1 @@
20250608
20260117
@@ -6,6 +6,7 @@ packages = [
"automake",
"binutils",
"bison",
"buildah",
"byacc",
"cmake",
"diffstat",
+1 -1
View File
@@ -1 +1 @@
20260106
20260117
+1 -1
View File
@@ -1 +1 @@
20260112
20260606
+1 -1
View File
@@ -1 +1 @@
20260113a
2.1.2
-1
View File
@@ -1,2 +1 @@
docker
incus
@@ -1,6 +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
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/AppStream/x86_64/os
gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/AppStream/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1
@@ -1,6 +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
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/BaseOS/x86_64/os
gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1
@@ -1,7 +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
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/CRB/x86_64/os
gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/CRB/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1
@@ -1,6 +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
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/HighAvailability/x86_64/os
gpgkey=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/almalinux-vault/9.7/HighAvailability/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1
@@ -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
@@ -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",
+1 -1
View File
@@ -1 +1 @@
20260112
20260606
+1
View File
@@ -0,0 +1 @@
docker
@@ -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"
]
+1
View File
@@ -0,0 +1 @@
20260606
+1
View File
@@ -0,0 +1 @@
docker
@@ -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"
]
+1
View File
@@ -0,0 +1 @@
20260606
+1 -1
View File
@@ -1 +1 @@
20260112
20260606
+1
View File
@@ -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"
]
+1
View File
@@ -0,0 +1 @@
20260606
+1 -1
View File
@@ -1 +1 @@
20260112
20260606
+1
View File
@@ -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"
]
+1
View File
@@ -0,0 +1 @@
20260606
@@ -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
@@ -6,6 +6,7 @@ packages = [
"automake",
"binutils",
"bison",
"buildah",
"byacc",
"cmake",
"diffstat",
+1 -1
View File
@@ -1 +1 @@
20260112
20260606
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,6 @@
[updates]
name=Fedora 42 - x86_64 - Updates
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/42/Everything/x86_64
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-42-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[fedora]
name=Fedora 42 - x86_64
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/42/Everything/x86_64/os
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-42-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[gitea-unkin-fedora-42]
name=Unkin Fedora 42
baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/42
enabled=1
gpgcheck=1
gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -0,0 +1,24 @@
# fedora/42/base
docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:42"
deploy_files_from_image = true
deploy_files_from_common = false
scripts_pre_file_copy = [
"rm -f /etc/yum.repos.d/*.repo",
"curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc42/files/15674 && rpm -i unkin-ca-certificates.rpm",
]
packages = [
"git",
"jq",
"make",
"python3",
"python3-pip",
"wget",
]
scripts_pre_packages = [
"dnf makecache",
"dnf update -y",
]
scripts_final = [
"dnf clean all",
"rm -rf /var/cache/dnf"
]
+1
View File
@@ -0,0 +1 @@
20260521
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,47 @@
# fedora/42/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"
]
+1
View File
@@ -0,0 +1 @@
20260521
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,6 @@
[updates]
name=Fedora 43 - x86_64 - Updates
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/43/Everything/x86_64
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[fedora]
name=Fedora 43 - x86_64
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/43/Everything/x86_64/os
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[gitea-unkin-fedora-43]
name=Unkin Fedora 43
baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/43
enabled=1
gpgcheck=1
gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -0,0 +1,24 @@
# fedora/43/base
docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:43"
deploy_files_from_image = true
deploy_files_from_common = false
scripts_pre_file_copy = [
"rm -f /etc/yum.repos.d/*.repo",
"curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc43/files/15602 && rpm -i unkin-ca-certificates.rpm",
]
packages = [
"git",
"jq",
"make",
"python3",
"python3-pip",
"wget",
]
scripts_pre_packages = [
"dnf makecache",
"dnf update -y",
]
scripts_final = [
"dnf clean all",
"rm -rf /var/cache/dnf"
]
+1
View File
@@ -0,0 +1 @@
20260521
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,47 @@
# fedora/43/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"
]
+1
View File
@@ -0,0 +1 @@
20260521
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,6 @@
[updates]
name=Fedora 44 - x86_64 - Updates
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/updates/44/Everything/x86_64
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[fedora]
name=Fedora 44 - x86_64
baseurl=https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/fedora/releases/44/Everything/x86_64/os
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary
enabled=1
gpgcheck=1
@@ -0,0 +1,6 @@
[gitea-unkin-fedora-44]
name=Unkin Fedora 44
baseurl=https://git.unkin.net/api/packages/unkin/rpm/fedora/44
enabled=1
gpgcheck=1
gpgkey=https://git.unkin.net/api/packages/unkin/rpm/repository.key
@@ -0,0 +1,24 @@
# fedora/44/base
docker_source = "artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/fedora:44"
deploy_files_from_image = true
deploy_files_from_common = false
scripts_pre_file_copy = [
"rm -f /etc/yum.repos.d/*.repo",
"curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1.fc44/files/15656 && rpm -i unkin-ca-certificates.rpm",
]
packages = [
"git",
"jq",
"make",
"python3",
"python3-pip",
"wget",
]
scripts_pre_packages = [
"dnf makecache",
"dnf update -y",
]
scripts_final = [
"dnf clean all",
"rm -rf /var/cache/dnf"
]
+1
View File
@@ -0,0 +1 @@
20260514
+1
View File
@@ -0,0 +1 @@
docker
@@ -0,0 +1,47 @@
# fedora/44/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"
]
+1
View File
@@ -0,0 +1 @@
20260521
+5
View File
@@ -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