ci: publish nvidia tag variant for ubuntu

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

.github/workflows/buildkit.yml

@@ -188,12 +188,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        base:
-          - ''
-          - alpine
-        target:
-          - ''
-          - rootless
+        include:
+          -
+            base: 'ubuntu'
+          -
+            base: 'ubuntu'
+            target: 'rootless'
+          -
+            base: 'ubuntu'
+            build-tag: 'nvidia'
+          -
+            base: 'alpine'
+          -
+            base: 'alpine'
+            target: 'rootless'
     steps:
       -
         name: Checkout
@@ -226,6 +234,7 @@ jobs:
           RELEASE: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
           BASE: ${{ matrix.base }}
           TARGET: ${{ matrix.target }}
+          BUILD_TAG: ${{ matrix.build-tag }}
           CACHE_FROM: type=gha,scope=image${{ matrix.target }}
           CACHE_TO: type=gha,scope=image${{ matrix.target }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

hack/images

@@ -11,7 +11,9 @@ set -eu -o pipefail
 : "${PLATFORMS=}"
 : "${BASE=}"
 : "${TARGET=}"
+: "${BUILD_TAG=}"
 
+defaultBase="ubuntu"
 versionTag=$(git describe --always --tags --match "v[0-9]*")
 
 if [[ ! "$versionTag" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -83,18 +85,36 @@ fi
 if [ -n "$BASE" ]; then
   tagNames="$tagNames-$BASE"
 fi
+if [ -n "$BUILD_TAG" ]; then
+  tagNames="$tagNames-$BUILD_TAG"
+fi
+if [ "$BASE" = "$defaultBase" ]; then
+  tagNames="$tagNames $REPO:$TAG"
+fi
 
 if [[ "$versionTag" == "$TAG" ]]; then
   if [ -n "$TARGET" ]; then
     tagNames="$tagNames $REPO:$TARGET"
     if [ -n "$BASE" ]; then
       tagNames="$tagNames-$BASE"
     fi
+    if [ -n "$BUILD_TAG" ]; then
+      tagNames="$tagNames-$BUILD_TAG"
+    fi
+    if [ "$BASE" = "$defaultBase" ]; then
+      tagNames="$tagNames $REPO:$TARGET"
+    fi
   else
     tagNames="$tagNames $REPO:latest"
     if [ -n "$BASE" ]; then
       tagNames="$tagNames-$BASE"
     fi
+    if [ -n "$BUILD_TAG" ]; then
+      tagNames="$tagNames-$BUILD_TAG"
+    fi
+    if [ "$BASE" = "$defaultBase" ]; then
+      tagNames="$tagNames $REPO:latest"
+    fi
   fi
 fi
 
@@ -126,5 +146,11 @@ if [[ "$RELEASE" = "true" ]] && [[ "$GITHUB_ACTIONS" = "true" ]]; then
   nocacheFilterFlag="--no-cache-filter=buildkit-export,gobuild-base,rootless"
 fi
 
+if [ -n "$BUILD_TAG" ]; then
+  [ -n "$BUILDKITD_TAGS" ] && BUILDKITD_TAGS="$BUILDKITD_TAGS "
+  BUILDKITD_TAGS="$BUILDKITD_TAGS$BUILD_TAG"
+  export BUILDKITD_TAGS
+fi
+
 buildxCmd build --build-arg "BUILDKIT_CONTEXT_KEEP_GIT_DIR=1" --build-arg BUILDKITD_TAGS --build-arg BUILDKIT_DEBUG $exportBaseArg $platformFlag $targetFlag $importCacheFlags $exportCacheFlags $tagFlags $outputFlag $nocacheFilterFlag $attestFlags \
   $currentcontext