ci: publish both ubuntu and alpine variants

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

Author: crazy-max

.github/workflows/buildkit.yml

@@ -188,7 +188,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-stage:
+        base:
+          - ''
+          - alpine
+        target:
           - ''
           - rootless
     steps:
@@ -221,9 +224,10 @@ jobs:
           ./hack/images "${{ needs.prepare.outputs.tag }}" "$IMAGE_NAME" "${{ needs.prepare.outputs.push }}"
         env:
           RELEASE: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
-          TARGET: ${{ matrix.target-stage }}
-          CACHE_FROM: type=gha,scope=image${{ matrix.target-stage }}
-          CACHE_TO: type=gha,scope=image${{ matrix.target-stage }}
+          BASE: ${{ matrix.base }}
+          TARGET: ${{ matrix.target }}
+          CACHE_FROM: type=gha,scope=image${{ matrix.target }}
+          CACHE_TO: type=gha,scope=image${{ matrix.target }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   scout:

hack/images

@@ -9,6 +9,7 @@ set -eu -o pipefail
 
 : "${RELEASE=false}"
 : "${PLATFORMS=}"
+: "${BASE=}"
 : "${TARGET=}"
 
 versionTag=$(git describe --always --tags --match "v[0-9]*")
@@ -70,16 +71,30 @@ if [ -n "$TARGET" ]; then
   targetFlag="--target=$TARGET"
 fi
 
+exportBaseArg=""
+if [ -n "$BASE" ]; then
+  exportBaseArg="--build-arg=EXPORT_BASE=$BASE"
+fi
+
 tagNames="$REPO:$TAG"
 if [ -n "$TARGET" ]; then
   tagNames="$tagNames-$TARGET"
 fi
+if [ -n "$BASE" ]; then
+  tagNames="$tagNames-$BASE"
+fi
 
 if [[ "$versionTag" == "$TAG" ]]; then
   if [ -n "$TARGET" ]; then
     tagNames="$tagNames $REPO:$TARGET"
+    if [ -n "$BASE" ]; then
+      tagNames="$tagNames-$BASE"
+    fi
   else
     tagNames="$tagNames $REPO:latest"
+    if [ -n "$BASE" ]; then
+      tagNames="$tagNames-$BASE"
+    fi
   fi
 fi
 
@@ -111,5 +126,5 @@ if [[ "$RELEASE" = "true" ]] && [[ "$GITHUB_ACTIONS" = "true" ]]; then
   nocacheFilterFlag="--no-cache-filter=buildkit-export,gobuild-base,rootless"
 fi
 
-buildxCmd build --build-arg "BUILDKIT_CONTEXT_KEEP_GIT_DIR=1" --build-arg BUILDKITD_TAGS --build-arg BUILDKIT_DEBUG --build-arg EXPORT_BASE $platformFlag $targetFlag $importCacheFlags $exportCacheFlags $tagFlags $outputFlag $nocacheFilterFlag $attestFlags \
+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