Compare commits
2 Commits
master
...
46d1775e51
| Author | SHA1 | Date | |
|---|---|---|---|
| 46d1775e51 | |||
| afceaa8618 |
@@ -50,11 +50,11 @@ build {
|
|||||||
|
|
||||||
post-processor "shell-local" {
|
post-processor "shell-local" {
|
||||||
inline = [
|
inline = [
|
||||||
"incus image alias delete local:${local.incus_base_name}/latest || true",
|
"incus image alias delete $(incus remote get-default):${local.incus_base_name}/latest || true",
|
||||||
"incus image alias delete local:${local.incus_base_name}/${var.date} || true",
|
"incus image alias delete $(incus remote get-default):${local.incus_base_name}/${var.date} || true",
|
||||||
"incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}'",
|
"incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}'",
|
||||||
"incus image alias create local:${local.incus_base_name}/latest $(incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}')",
|
"incus image alias create $(incus remote get-default):${local.incus_base_name}/latest $(incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}')",
|
||||||
"incus image alias create local:${local.incus_base_name}/${var.date} $(incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}')"
|
"incus image alias create $(incus remote get-default):${local.incus_base_name}/${var.date} $(incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}')"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
docker
|
docker
|
||||||
|
incus
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# almalinux/8.10/base
|
# almalinux/8.10/base
|
||||||
deploy_files_from_image = true
|
deploy_files_from_image = true
|
||||||
deploy_files_from_common = true
|
deploy_files_from_common = true
|
||||||
use_incus = false
|
use_incus = true
|
||||||
packages = [
|
packages = [
|
||||||
"git",
|
"git",
|
||||||
"jq",
|
"jq",
|
||||||
@@ -10,6 +10,7 @@ packages = [
|
|||||||
"python3.11-pip",
|
"python3.11-pip",
|
||||||
"python3.12",
|
"python3.12",
|
||||||
"python3.12-pip",
|
"python3.12-pip",
|
||||||
|
"unkin-ca-certificates",
|
||||||
"uv",
|
"uv",
|
||||||
"wget",
|
"wget",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
incus
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
[puppet]
|
||||||
|
name=puppet repository
|
||||||
|
baseurl=https://packagerepo.service.consul/puppet7/el/8-daily/x86_64/os/
|
||||||
|
gpgkey=https://packagerepo.service.consul/puppet7/el/8-daily/x86_64/os/RPM-GPG-KEY-puppet-20250406
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# almalinux/8.10/puppet-base
|
||||||
|
incus_source = "almalinux8/base/latest"
|
||||||
|
deploy_files_from_image = true
|
||||||
|
use_incus = true
|
||||||
|
packages = [
|
||||||
|
"puppet-agent",
|
||||||
|
"puppet-initial"
|
||||||
|
]
|
||||||
|
scripts_pre_packages = [
|
||||||
|
"dnf makecache",
|
||||||
|
"dnf update -y",
|
||||||
|
]
|
||||||
|
scripts_final = [
|
||||||
|
"dnf clean all",
|
||||||
|
"rm -rf /var/cache/dnf"
|
||||||
|
]
|
||||||
@@ -1 +1,2 @@
|
|||||||
docker
|
docker
|
||||||
|
incus
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# almalinux/9.5/base
|
# almalinux/9.5/base
|
||||||
deploy_files_from_image = true
|
deploy_files_from_image = true
|
||||||
deploy_files_from_common = true
|
deploy_files_from_common = true
|
||||||
use_incus = false
|
use_incus = true
|
||||||
packages = [
|
packages = [
|
||||||
"git",
|
"git",
|
||||||
"jq",
|
"jq",
|
||||||
@@ -10,6 +10,7 @@ packages = [
|
|||||||
"python3.11-pip",
|
"python3.11-pip",
|
||||||
"python3.12",
|
"python3.12",
|
||||||
"python3.12-pip",
|
"python3.12-pip",
|
||||||
|
"unkin-ca-certificates",
|
||||||
"uv",
|
"uv",
|
||||||
"wget",
|
"wget",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
incus
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# almalinux/9.5/puppet-base
|
||||||
|
incus_source = "almalinux9/base/latest"
|
||||||
|
deploy_files_from_image = true
|
||||||
|
use_incus = true
|
||||||
|
packages = [
|
||||||
|
"puppet-agent",
|
||||||
|
"puppet-initial"
|
||||||
|
]
|
||||||
|
scripts_pre_packages = [
|
||||||
|
"dnf makecache",
|
||||||
|
"dnf update -y",
|
||||||
|
]
|
||||||
|
scripts_final = [
|
||||||
|
"dnf clean all",
|
||||||
|
"rm -rf /var/cache/dnf"
|
||||||
|
]
|
||||||
@@ -7,5 +7,4 @@ source "docker" "os" {
|
|||||||
source "incus" "os" {
|
source "incus" "os" {
|
||||||
image = var.incus_source
|
image = var.incus_source
|
||||||
output_image = local.incus_output_image
|
output_image = local.incus_output_image
|
||||||
publish_remote_name = "local"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,7 +121,6 @@ variable "git_branch" {
|
|||||||
type = string
|
type = string
|
||||||
default = env("GIT_BRANCH")
|
default = env("GIT_BRANCH")
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "include_incus_client_certs" {
|
variable "include_incus_client_certs" {
|
||||||
type = bool
|
type = bool
|
||||||
default = false
|
default = false
|
||||||
|
|||||||
Reference in New Issue
Block a user