From be8cde5681b0ed166cfb8d6b374e0654d9ab7537 Mon Sep 17 00:00:00 2001 From: Florian Lemaitre Date: Tue, 19 Aug 2025 15:46:08 +0200 Subject: [PATCH] Support for latest image tagging --- .github/workflows/make-release.yml | 2 +- justfile | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 1cf6eba49..304fc14cb 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -98,7 +98,7 @@ jobs: run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_LOGIN }} --password-stdin - name: Build - run: just tag=$VERSION platform=linux/arm64,linux/amd64,windows/amd64 load=false push=true ${{ matrix.type }} + run: just tag=$VERSION platform=linux/arm64,linux/amd64,windows/amd64 load=false push=true latest=true ${{ matrix.type }} publish-nuget: diff --git a/justfile b/justfile index c2cd325d6..b42bb2cd7 100644 --- a/justfile +++ b/justfile @@ -15,6 +15,7 @@ replicas := "3" partitions := "2" platform := "" push := "false" +latest := "false" load := "true" ingress := "true" prometheus := "true" @@ -258,27 +259,19 @@ restart serviceName: (container "restart" serviceName) # Custom command to build a single image build imageTag dockerFile target="": - #!/usr/bin/env bash + #!/bin/sh - target_parameter="" - if [ "{{target}}" != "" ]; then - target_parameter="--target {{target}}" - fi - platform_parameter="" - if [ "{{platform}}" != "" ]; then - platform_parameter="--platform {{platform}}" - fi - push_parameter="" - if [ "{{push}}" == "true" ]; then - push_parameter="--push --provenance true" - fi - load_parameter="" - if [ "{{load}}" == "true" ]; then - load_parameter="--load" - fi + tag="{{imageTag}}" + + set -- + [ -z "{{target}}" ] || set -- "$@" --target "{{target}}" + [ -z "{{platform}}" ] || set -- "$@" --platform "{{platform}}" + [ "{{push}}" != "true" ] || set -- "$@" --push --provenance true + [ "{{load}}" != "true" ] || set -- "$@" --load + [ "{{latest}}" != "true" ] || set -- "$@" -t "${tag%:*}:latest" set -x - docker buildx build --progress=plain --build-arg VERSION={{tag}} $platform_parameter $load_parameter $push_parameter $target_parameter -t "{{imageTag}}" -f "{{dockerFile}}" ./ + docker buildx build --progress=plain --build-arg VERSION={{tag}} "$@" -t "$tag" -f "{{dockerFile}}" ./ # Build Worker buildWorker: (build TF_VAR_worker_image TF_VAR_worker_docker_file_path + "Dockerfile")