Skip to content

Commit 8e7ae96

Browse files
authored
chore(just): stop hardcoding default values (#2594)
1 parent 0af6a88 commit 8e7ae96

1 file changed

Lines changed: 22 additions & 18 deletions

File tree

Justfile

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ tags := '(
2323
[testing]=testing
2424
)'
2525

26+
default_image := "aurora"
27+
default_tag := "latest"
28+
default_flavor := "main"
29+
2630
# Build Containers
2731
chunkah := shell("yq -r \".images[] | select(.name == \\\"chunkah\\\") | \\\"\\\\(.image)@\\\\(.digest)\\\"\" image-versions.yml")
2832
common := shell("yq -r \".images[] | select(.name == \\\"common\\\") | \\\"\\\\(.image)@\\\\(.digest)\\\"\" image-versions.yml")
@@ -132,7 +136,7 @@ validate $image $tag $flavor:
132136
[arg("retry_pull", long="retry-pull", value="true")]
133137
[arg("tag", long="tag", short="t")]
134138
[group('Image')]
135-
build $image="aurora" $tag="latest" $flavor="main" $rechunk="false" $ghcr="false" $kernel_pin="" $retry_pull="false":
139+
build $image=default_image $tag=default_tag $flavor=default_flavor $rechunk="false" $ghcr="false" $kernel_pin="" $retry_pull="false":
136140
#!/usr/bin/env bash
137141
set -eoux pipefail
138142
@@ -315,14 +319,14 @@ build $image="aurora" $tag="latest" $flavor="main" $rechunk="false" $ghcr="false
315319
[arg("retry_pull", long="retry-pull", value="true")]
316320
[arg("tag", long="tag", short="t")]
317321
[group('Image')]
318-
build-rechunk $image="aurora" $tag="latest" $flavor="main" $kernel_pin="" $retry_pull="false": (build image tag flavor kernel_pin retry_pull) (rechunk image tag flavor)
322+
build-rechunk $image=default_image $tag=default_tag $flavor=default_flavor $kernel_pin="" $retry_pull="false": (build image tag flavor kernel_pin retry_pull) (rechunk image tag flavor)
319323

320324
# Rechunk Image
321325
[arg("flavor", long="flavor", short="f")]
322326
[arg("image", long="image", short="i")]
323327
[arg("tag", long="tag", short="t")]
324328
[group('Image')]
325-
rechunk $image="aurora" $tag="latest" $flavor="main":
329+
rechunk $image=default_image $tag=default_tag $flavor=default_flavor:
326330
#!/usr/bin/env bash
327331
set -eoux pipefail
328332
@@ -357,7 +361,7 @@ rechunk $image="aurora" $tag="latest" $flavor="main":
357361
[arg("previous_build", long="previous-build", value="true")]
358362
[arg("tag", long="tag", short="t")]
359363
[group('Image')]
360-
ostree-rechunk $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $previous_build="false":
364+
ostree-rechunk $image=default_image $tag=default_tag $flavor=default_flavor $ghcr="false" $previous_build="false":
361365
#!/usr/bin/env bash
362366
set -eoux pipefail
363367
@@ -419,7 +423,7 @@ ostree-rechunk $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $previ
419423
[arg("image", long="image", short="i")]
420424
[arg("tag", long="tag", short="t")]
421425
[group('Image')]
422-
load-rootful $image="aurora" $tag="latest" $flavor="main":
426+
load-rootful $image=default_image $tag=default_tag $flavor=default_flavor:
423427
#!/usr/bin/env bash
424428
set -oux pipefail
425429
@@ -439,7 +443,7 @@ load-rootful $image="aurora" $tag="latest" $flavor="main":
439443
[arg("image", long="image", short="i")]
440444
[arg("tag", long="tag", short="t")]
441445
[group('Utility')]
442-
export-oci $image="aurora" $tag="latest" $flavor="main":
446+
export-oci $image=default_image $tag=default_tag $flavor=default_flavor:
443447
#!/usr/bin/env bash
444448
set -oux pipefail
445449
@@ -455,7 +459,7 @@ export-oci $image="aurora" $tag="latest" $flavor="main":
455459
[arg("image", long="image", short="i")]
456460
[arg("tag", long="tag", short="t")]
457461
[group('Image')]
458-
run $image="aurora" $tag="latest" $flavor="main":
462+
run $image=default_image $tag=default_tag $flavor=default_flavor:
459463
#!/usr/bin/env bash
460464
set -eoux pipefail
461465
@@ -482,7 +486,7 @@ changelogs branch="stable" handwritten="":
482486
[arg("image", long="image", short="i")]
483487
[arg("tag", long="tag", short="t")]
484488
[group('Utility')]
485-
secureboot $image="aurora" $tag="latest" $flavor="main":
489+
secureboot $image=default_image $tag=default_tag $flavor=default_flavor:
486490
#!/usr/bin/env bash
487491
set -eou pipefail
488492
@@ -533,7 +537,7 @@ secureboot $image="aurora" $tag="latest" $flavor="main":
533537
[arg("image", long="image", short="i")]
534538
[arg("tag", long="tag", short="t")]
535539
[private]
536-
fedora_version image="aurora" tag="latest" flavor="main":
540+
fedora_version image=default_image tag=default_tag flavor=default_flavor:
537541
#!/usr/bin/env bash
538542
set -eou pipefail
539543
@@ -552,7 +556,7 @@ fedora_version image="aurora" tag="latest" flavor="main":
552556
553557
[arg("tag", long="tag", short="t")]
554558
[private]
555-
akmods_flavor tag="latest":
559+
akmods_flavor tag=default_tag:
556560
#!/usr/bin/env bash
557561
set -eou pipefail
558562
@@ -571,7 +575,7 @@ akmods_flavor tag="latest":
571575
[arg("image", long="image", short="i")]
572576
[arg("tag", long="tag", short="t")]
573577
[private]
574-
image_name image="aurora" tag="latest" flavor="main":
578+
image_name image=default_image tag=default_tag flavor=default_flavor:
575579
#!/usr/bin/env bash
576580
set -eoux pipefail
577581
@@ -593,7 +597,7 @@ image_name image="aurora" tag="latest" flavor="main":
593597
[arg("tag", long="tag", short="t")]
594598
[arg("version", long="version")]
595599
[group('Utility')]
596-
generate-build-tags $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $version="" $github_event="" $github_number="":
600+
generate-build-tags $image=default_image $tag=default_tag $flavor=default_flavor $ghcr="false" $version="" $github_event="" $github_number="":
597601
#!/usr/bin/env bash
598602
set -eoux pipefail
599603
@@ -660,7 +664,7 @@ generate-build-tags $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $
660664
[arg("image", long="image", short="i")]
661665
[arg("tag", long="tag", short="t")]
662666
[private]
663-
generate-point $image="aurora" $tag="latest" $flavor="main":
667+
generate-point $image=default_image $tag=default_tag $flavor=default_flavor:
664668
#!/usr/bin/env bash
665669
set -eoux pipefail
666670
@@ -718,7 +722,7 @@ tag-images $image="" $default_tag="" $tags="":
718722
[arg("image", long="image", short="i")]
719723
[arg("tag", long="tag", short="t")]
720724
[group('Utility')]
721-
gen-sbom $image="aurora" $tag="latest" $flavor="main" $syft_cmd="syft":
725+
gen-sbom $image=default_image $tag=default_tag $flavor=default_flavor $syft_cmd="syft":
722726
#!/usr/bin/env bash
723727
set -eoux pipefail
724728
@@ -760,7 +764,7 @@ gen-sbom $image="aurora" $tag="latest" $flavor="main" $syft_cmd="syft":
760764
[arg("tag", long="tag", short="t")]
761765
[group('Utility')]
762766
[private]
763-
setup-cache $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $pull="false" $push="false" $registry="" $github_event="":
767+
setup-cache $image=default_image $tag=default_tag $flavor=default_flavor $ghcr="false" $pull="false" $push="false" $registry="" $github_event="":
764768
#!/usr/bin/env bash
765769
set -eou pipefail
766770
@@ -808,7 +812,7 @@ setup-cache $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $pull="fa
808812
[arg("image", long="image", short="i")]
809813
[arg("tag", long="tag", short="t")]
810814
[private]
811-
bootc $image="aurora" $tag="latest" $flavor="main" *ARGS:
815+
bootc $image=default_image $tag=default_tag $flavor=default_flavor *ARGS:
812816
#!/usr/bin/env bash
813817
set -eoux pipefail
814818
@@ -838,7 +842,7 @@ bootc $image="aurora" $tag="latest" $flavor="main" *ARGS:
838842
[arg("image", long="image", short="i")]
839843
[arg("tag", long="tag", short="t")]
840844
[group('Utility')]
841-
disk-image $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $backend="ostree":
845+
disk-image $image=default_image $tag=default_tag $flavor=default_flavor $ghcr="false" $backend="ostree":
842846
#!/usr/bin/env bash
843847
set -eoux pipefail
844848
@@ -887,7 +891,7 @@ disk-image $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $backend="
887891
[arg("temp_push", long="temp-push", value="true")]
888892
[arg("temp_push_tag", long="temp-push-tag")]
889893
[group('Utility')]
890-
push-image $image="aurora" $tag="latest" $flavor="main" $ghcr="false" $registry="" $temp_push="false" $temp_push_tag="":
894+
push-image $image=default_image $tag=default_tag $flavor=default_flavor $ghcr="false" $registry="" $temp_push="false" $temp_push_tag="":
891895
#!/usr/bin/env bash
892896
set -eoux pipefail
893897

0 commit comments

Comments
 (0)