Skip to content

Commit 629c92b

Browse files
committed
refactor: change var name
1 parent d5aac3f commit 629c92b

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ jobs:
2020
steps:
2121
- name: Checkout repository
2222
uses: actions/checkout@v4
23-
with:
24-
fetch-depth: 0
25-
fetch-tags: true
2623

2724
- name: Build container image
2825
uses: getdevopspro/github-actions/buildx-bake@v0.2.12

docker-bake.hcl

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ variable "IMAGE_NAME" {
33
default = "ghcr.io/getdevopspro/jetson-linux-builder"
44
}
55

6-
variable "JETSON_VERSIONS" {
6+
variable "JETSON_VERSION_PAIRS" {
77
# IMPORTANT: latest always be the first element in the list
8-
default = [
9-
{
10-
ubuntu_release = "jammy"
11-
number = "36.4.3"
12-
},
13-
{
14-
ubuntu_release = "focal"
15-
number = "35.6.1"
16-
},
17-
]
8+
default = ["36.4.3,jammy", "35.6.1,focal"]
9+
}
10+
11+
function "jetson_version" {
12+
params = [jetson_version_pair]
13+
result = split(",", jetson_version_pair)[0]
14+
}
15+
16+
function "jetson_ubuntu_release" {
17+
params = [jetson_version_pair]
18+
result = split(",", jetson_version_pair)[1]
1819
}
1920

2021
target "docker-metadata-action" {}
@@ -23,32 +24,32 @@ target "build" {
2324
inherits = ["docker-metadata-action"]
2425
context = "./"
2526
dockerfile = "Dockerfile"
26-
name = "${replace(sanitize(IMAGE_NAME), "_", "-")}-${replace(sanitize(jetson_version.number), "_", "-")}"
27+
name = "${replace(sanitize(IMAGE_NAME), "_", "-")}-${replace(sanitize(jetson_version(jetson_version_pair)), "_", "-")}"
2728
platforms = [
2829
"linux/amd64",
2930
"linux/arm64",
3031
]
3132
matrix = {
32-
jetson_version = JETSON_VERSIONS
33+
jetson_version_pair = JETSON_VERSION_PAIRS
3334
}
3435
args = {
35-
JETSON_VERSION = jetson_version.number,
36-
JETSON_VERSION_MAJOR = split(".", jetson_version.number)[0],
37-
JETSON_VERSION_MINOR = split(".", jetson_version.number)[1],
38-
JETSON_VERSION_PATCH = split(".", jetson_version.number)[2],
39-
ARG_IMAGE_FROM = "docker.io/ubuntu:${jetson_version.ubuntu_release}",
36+
JETSON_VERSION = jetson_version(jetson_version_pair),
37+
JETSON_VERSION_MAJOR = split(".", jetson_version(jetson_version_pair))[0],
38+
JETSON_VERSION_MINOR = split(".", jetson_version(jetson_version_pair))[1],
39+
JETSON_VERSION_PATCH = split(".", jetson_version(jetson_version_pair))[2],
40+
ARG_IMAGE_FROM = "docker.io/ubuntu:${jetson_ubuntu_release(jetson_version_pair)}",
4041
}
4142
tags = concat(
42-
jetson_version.number == JETSON_VERSIONS[0].number ? ["${IMAGE_NAME}:latest"] : [],
43+
jetson_version_pair == JETSON_VERSION_PAIRS[0] ? ["${IMAGE_NAME}:latest"] : [],
4344
[
44-
"${IMAGE_NAME}:${split(".", jetson_version.number)[0]}",
45-
"${IMAGE_NAME}:${split(".", jetson_version.number)[0]}.${split(".", jetson_version.number)[1]}",
46-
"${IMAGE_NAME}:${jetson_version.number}",
47-
"${IMAGE_NAME}:${jetson_version.number}-${formatdate("YYYYMMDDhhmm", timestamp())}",
45+
"${IMAGE_NAME}:${split(".", jetson_version(jetson_version_pair))[0]}",
46+
"${IMAGE_NAME}:${split(".", jetson_version(jetson_version_pair))[0]}.${split(".", jetson_version(jetson_version_pair))[1]}",
47+
"${IMAGE_NAME}:${jetson_version(jetson_version_pair)}",
48+
"${IMAGE_NAME}:${jetson_version(jetson_version_pair)}-${formatdate("YYYYMMDDhhmm", timestamp())}",
4849
]
4950
)
5051
labels = {
51-
"manifest:org.opencontainers.image.version" : jetson_version.number
52-
"org.opencontainers.image.version" = jetson_version.number
52+
"manifest:org.opencontainers.image.version" : jetson_version(jetson_version_pair)
53+
"org.opencontainers.image.version" = jetson_version(jetson_version_pair)
5354
}
5455
}

0 commit comments

Comments
 (0)