unkin/packer-images
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: unkin:master
Branches Tags
unkin:master
unkin:benvin/artifactapi_updates
..
compare: unkin:benvin/artifactapi_updates
Branches Tags
unkin:master
unkin:benvin/artifactapi_updates

1 Commits
master ... benvin/art

Author SHA1 Message Date
Ben Vincent
4e8f97ba7e chore: bump artifactapi
All checks were successful
Build / build (pull_request) Successful in 39s
Details 
- unkin/artifactapi#3
 2026-01-10 17:04:09 +11:00
57 changed files with 75 additions and 77 deletions
Show Stats Expand all files Collapse all files

1
Makefile
View File

@ -81,7 +81,6 @@ $(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) && \

2
builds/docker.pkr.hcl
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.git_commit, var.version]
tags = ["latest", var.date]
}
dynamic "post-processor" {

2
images/almalinux/8.10/actionsdind/version
View File

@ -1 +1 @@
20260117
20260106

4
images/almalinux/8.10/base/files/etc/yum.repos.d/appstream.repo
View File

@ -1,6 +1,6 @@
[appstream]
name=appstream repository
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
baseurl=https://edgecache.query.consul/almalinux/8.10/AppStream/x86_64/os
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
enabled=1
gpgcheck=1

4
images/almalinux/8.10/base/files/etc/yum.repos.d/baseos.repo
View File

@ -1,6 +1,6 @@
[baseos]
name=baseos repository
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
baseurl=https://edgecache.query.consul/almalinux/8.10/BaseOS/x86_64/os
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
enabled=1
gpgcheck=1

4
images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo
View File

@ -1,6 +1,6 @@
[epel]
name=epel repository
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
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
enabled=1
gpgcheck=1

4
images/almalinux/8.10/base/files/etc/yum.repos.d/extras.repo Normal file
View File

@ -0,0 +1,4 @@
[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

10
images/almalinux/8.10/base/files/etc/yum.repos.d/highavailability.repo
View File

@ -1,6 +1,4 @@
[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
[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

4
images/almalinux/8.10/base/files/etc/yum.repos.d/powertools.repo
View File

@ -1,7 +1,7 @@
# replaced by crb repo in EL9
[powertools]
name=powertools repository
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
baseurl=https://edgecache.query.consul/almalinux/8.10/PowerTools/x86_64/os
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8
enabled=1
gpgcheck=1

2
images/almalinux/8.10/base/version
View File

@ -1 +1 @@
20260117
20260106

2
images/almalinux/8.10/jupyterlab/version
View File

@ -1 +1 @@
20260117
20250608

2
images/almalinux/8.10/rpmbuilder/version
View File

@ -1 +1 @@
20260117
20260106

0
images/almalinux/9.7/actionsdind/builds → images/almalinux/9.6/actionsdind/builds
View File

2
images/almalinux/9.7/actionsdind/variables.auto.pkrvars.hcl → images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/actionsdind
# almalinux/9.6/actionsdind
deploy_files_from_common = true
include_incus_client_certs = true
docker_source = "git.unkin.net/unkin/almalinux9-base:latest"

1
images/almalinux/9.6/actionsdind/version Normal file
View File

@ -0,0 +1 @@
20260106

0
images/almalinux/9.7/artifactapi/builds → images/almalinux/9.6/artifactapi/builds
View File

2
images/almalinux/9.7/artifactapi/variables.auto.pkrvars.hcl → images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/artifactapi
# almalinux/9.6/rpmbuilder
docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
packages = [
"sudo"

1
images/almalinux/9.6/artifactapi/version Normal file
View File

@ -0,0 +1 @@
20260110

0
images/almalinux/9.7/base/builds → images/almalinux/9.6/base/builds
View File

6
images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo Normal file
View File

@ -0,0 +1,6 @@
[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

6
images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo Normal file
View File

@ -0,0 +1,6 @@
[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

7
images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo Normal file
View File

@ -0,0 +1,7 @@
# 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

6
images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo Normal file
View File

@ -0,0 +1,6 @@
[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

6
images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo Normal file
View File

@ -0,0 +1,6 @@
[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

4
images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo Normal file
View File

@ -0,0 +1,4 @@
[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

0
images/almalinux/9.7/base/files/etc/yum.repos.d/unkin.repo → images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo
View File

2
images/almalinux/9.7/base/variables.auto.pkrvars.hcl → images/almalinux/9.6/base/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/base
# almalinux/9.6/base
deploy_files_from_image = true
deploy_files_from_common = true
use_incus = true

1
images/almalinux/9.6/base/version Normal file
View File

@ -0,0 +1 @@
20260106

0
images/almalinux/9.7/jupyterlab/builds → images/almalinux/9.6/jupyterlab/builds
View File

2
images/almalinux/9.7/jupyterlab/variables.auto.pkrvars.hcl → images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/jupyterlab
# almalinux/9.5/jupyterlab
deploy_files_from_common = true
docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
scripts_pre_file_copy = [

1
images/almalinux/9.6/jupyterlab/version Normal file
View File

@ -0,0 +1 @@
20250608

0
images/almalinux/9.7/makerun/builds → images/almalinux/9.6/makerun/builds
View File

2
images/almalinux/9.7/makerun/variables.auto.pkrvars.hcl → images/almalinux/9.6/makerun/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/makerun
# almalinux/9.6/makerun
docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
packages = [
"sudo"

1
images/almalinux/9.6/makerun/version Normal file
View File

@ -0,0 +1 @@
20260110_2

0
images/almalinux/9.7/puppet-base/builds → images/almalinux/9.6/puppet-base/builds
View File

0
images/almalinux/9.7/puppet-base/files/etc/skel/.config/htop/htoprc → images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc
View File

4
images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo Normal file
View File

@ -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

2
images/almalinux/9.7/puppet-base/variables.auto.pkrvars.hcl → images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/puppet-base
# almalinux/9.5/puppet-base
incus_source = "almalinux9/base/latest"
deploy_files_from_image = true
use_incus = true

1
images/almalinux/9.6/puppet-base/version Normal file
View File

@ -0,0 +1 @@
20250712

0
images/almalinux/9.7/rpmbuilder/builds → images/almalinux/9.6/rpmbuilder/builds
View File

2
images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl → images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl
View File

@ -1,4 +1,4 @@
# almalinux/9.7/rpmbuilder
# almalinux/9.6/rpmbuilder
docker_source = "git.unkin.net/unkin/almalinux9-base:latest"
packages = [
"asciidoc",

1
images/almalinux/9.6/rpmbuilder/version Normal file
View File

@ -0,0 +1 @@
20260106

1
images/almalinux/9.7/actionsdind/version
View File

@ -1 +0,0 @@
20260112

1
images/almalinux/9.7/artifactapi/version
View File

@ -1 +0,0 @@
2.0.5

6
images/almalinux/9.7/base/files/etc/yum.repos.d/appstream.repo
View File

@ -1,6 +0,0 @@
[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

6
images/almalinux/9.7/base/files/etc/yum.repos.d/baseos.repo
View File

@ -1,6 +0,0 @@
[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

7
images/almalinux/9.7/base/files/etc/yum.repos.d/crb.repo
View File

@ -1,7 +0,0 @@
# 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

6
images/almalinux/9.7/base/files/etc/yum.repos.d/epel.repo
View File

@ -1,6 +0,0 @@
[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

6
images/almalinux/9.7/base/files/etc/yum.repos.d/highavailability.repo
View File

@ -1,6 +0,0 @@
[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
images/almalinux/9.7/base/version
View File

@ -1 +0,0 @@
20260112

1
images/almalinux/9.7/jupyterlab/version
View File

@ -1 +0,0 @@
20260112

1
images/almalinux/9.7/makerun/version
View File

@ -1 +0,0 @@
20260112

6
images/almalinux/9.7/puppet-base/files/etc/yum.repos.d/puppet.repo
View File

@ -1,6 +0,0 @@
[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
images/almalinux/9.7/puppet-base/version
View File

@ -1 +0,0 @@
20260112

1
images/almalinux/9.7/rpmbuilder/version
View File

@ -1 +0,0 @@
20260112

2
library/sources.pkr.hcl
View File

@ -7,5 +7,5 @@ source "docker" "os" {
source "incus" "os" {
image = var.incus_source
output_image = local.incus_output_image
profile = ["build"]
profile = "build"
}

5
library/variables.pkr.hcl
View File

@ -121,11 +121,6 @@ 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