Merge pull request #1600 from SaschaSchwarze0/sascha-filter-out-immut…

…able Revisit image tags in BuildAh sample build strategy
shipwright-io · May 14, 2024 · 6bed48b · 6bed48b
2 parents 2cb5754 + fe5ffc7
commit 6bed48b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 1 deletion.
diff --git a/hack/check-latest-images.sh b/hack/check-latest-images.sh
@@ -46,7 +46,7 @@ function update() {
         # Determine the latest tag
         QUERY=".tag_name"
         if [[ ${IMAGE} == *buildah* ]]; then
-                QUERY=".tags | sort_by(.name) | reverse | .[0].name"
+                QUERY="[.tags[] | select(.name | endswith(\"immutable\") | not) ] | sort_by(.name) | reverse | .[0].name"
         fi
         LATEST_TAG="$(curl --silent --retry 3 "${LATEST_RELEASE_URL}" | jq --raw-output "${QUERY}")"
 

diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
@@ -7,6 +7,7 @@ spec:
   buildSteps:
     - name: build
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true

diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
@@ -7,6 +7,7 @@ spec:
   buildSteps:
     - name: build-and-push
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:

diff --git a/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
@@ -22,6 +22,7 @@ spec:
           mountPath: /s2i
     - name: buildah
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: /s2i
       securityContext:
         privileged: true

diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
@@ -7,6 +7,7 @@ spec:
   steps:
     - name: build
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true

diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
@@ -7,6 +7,7 @@ spec:
   steps:
     - name: build-and-push
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:

diff --git a/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
@@ -24,6 +24,7 @@ spec:
           mountPath: /s2i
     - name: buildah
       image: quay.io/containers/buildah:v1.35.3
+      imagePullPolicy: Always
       workingDir: /s2i
       securityContext:
         capabilities: