Merge pull request #1733 from SaschaSchwarze0/sascha-update-buildkit

Add automation to trigger automatic updates of the BuildKit image in our sample build strategies

Author: openshift-merge-bot[bot]

.github/workflows/check-latest-images.yaml

@@ -13,6 +13,8 @@ jobs:
         include:
           - image: gcr.io/kaniko-project/executor
             latest-release-url: https://api.github.com/repos/GoogleContainerTools/kaniko/releases/latest
+          - image: moby/buildkit
+            latest-release-url: https://api.github.com/repos/moby/buildkit/releases/latest
           - image: quay.io/containers/buildah
             latest-release-url: https://quay.io/api/v1/repository/containers/buildah/tag/
     steps:

hack/check-latest-images.sh

@@ -36,7 +36,7 @@ function update() {
         echo "[INFO] Processing directory ${DIRECTORY}"
 
         # Search the image URL recursively and parse the current image tag
-        CURRENT_TAG="$( (grep --no-filename --recursive "${IMAGE}:" "${DIRECTORY}" || true) | head --lines=1 | sed -E "s#.*${IMAGE}:([v\.0-9]*).*?#\1#")"
+        CURRENT_TAG="$( (grep --no-filename --recursive "${IMAGE}:" "${DIRECTORY}" || true) | head --lines=1 | sed -E "s#.*${IMAGE}:([v\.0-9]*(-rootless)?).*?#\1#")"
         if [ "${CURRENT_TAG}" == "" ]; then
                 echo "[INFO] No image reference found"
                 return
@@ -50,6 +50,10 @@ function update() {
         fi
         LATEST_TAG="$(curl --silent --retry 3 "${LATEST_RELEASE_URL}" | jq --raw-output "${QUERY}")"
 
+        if [[ ${IMAGE} == *buildkit* ]]; then
+                LATEST_TAG="${LATEST_TAG}-rootless"
+        fi
+
         echo "[INFO] Determined latest tag ${LATEST_TAG}"
 
         # Search and modify the image tag with the latest