benvin/artifactapi_2.0.5 (#40)
All checks were successful
Deploy / build (push) Successful in 39s

Reviewed-on: #40
This commit is contained in:
Ben Vincent 2026-01-25 12:25:01 +11:00
parent b3f0b168fb
commit 4830421e43
3 changed files with 7 additions and 1 deletions

View File

@ -81,6 +81,7 @@ $(DIRS):
# Build the image # Build the image
@(cd $(IMAGES_PATH)/$@ && \ @(cd $(IMAGES_PATH)/$@ && \
export DATE=$(DATE_TAG) && \ export DATE=$(DATE_TAG) && \
export VERSION=$$(cat version) && \
export OS_NAME=$$(echo $@ | cut -d'/' -f1) && \ export OS_NAME=$$(echo $@ | cut -d'/' -f1) && \
export OS_VERSION_FULL=$$(echo $@ | cut -d'/' -f2) && \ export OS_VERSION_FULL=$$(echo $@ | cut -d'/' -f2) && \
export OS_IMAGE=$$(echo $@ | cut -d'/' -f3) && \ export OS_IMAGE=$$(echo $@ | cut -d'/' -f3) && \

View File

@ -64,7 +64,7 @@ build {
post-processors { post-processors {
post-processor "docker-tag" { post-processor "docker-tag" {
repository = "${var.docker_server}/unkin/${var.os_name}${var.os_version_major}-${var.os_image}" 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" { dynamic "post-processor" {

View File

@ -121,6 +121,11 @@ variable "git_branch" {
type = string type = string
default = env("GIT_BRANCH") default = env("GIT_BRANCH")
} }
variable "version" {
description = "The version from version file."
type = string
default = env("VERSION")
}
variable "include_incus_client_certs" { variable "include_incus_client_certs" {
type = bool type = bool
default = false default = false