Remove quotes from BASE_IMAGES

Zokormazo · mmorhun · commit 4c91f56a24d6 · 2025-01-22T14:06:24.000Z
Signed-off-by: Julen Landa Alustiza &lt;jlanda@redhat.com&gt;
diff --git a/task/buildah-oci-ta/0.3/buildah-oci-ta.yaml b/task/buildah-oci-ta/0.3/buildah-oci-ta.yaml
@@ -365,7 +365,7 @@ spec:
 
         dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" >/shared/parsed_dockerfile.json
         BASE_IMAGES=$(
-          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not)' /shared/parsed_dockerfile.json
+          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not) | sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json
         )
 
         BUILDAH_ARGS=()
diff --git a/task/buildah-remote-oci-ta/0.3/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.3/buildah-remote-oci-ta.yaml
@@ -399,7 +399,7 @@ spec:
 
       dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" >/shared/parsed_dockerfile.json
       BASE_IMAGES=$(
-        jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not)' /shared/parsed_dockerfile.json
+        jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not) | sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json
       )
 
       BUILDAH_ARGS=()
diff --git a/task/buildah-remote/0.3/buildah-remote.yaml b/task/buildah-remote/0.3/buildah-remote.yaml
@@ -375,7 +375,7 @@ spec:
 
       dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" > /shared/parsed_dockerfile.json
       BASE_IMAGES=$(
-          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not)' /shared/parsed_dockerfile.json
+          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not) | sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json
       )
 
       BUILDAH_ARGS=()
diff --git a/task/buildah/0.3/buildah.yaml b/task/buildah/0.3/buildah.yaml
@@ -296,7 +296,7 @@ spec:
 
       dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" > /shared/parsed_dockerfile.json
       BASE_IMAGES=$(
-          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not)' /shared/parsed_dockerfile.json
+          jq -r '.Stages[] | select(.From | .Stage or .Scratch | not) | .BaseName | select(test("^oci-archive:") | not) | sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json
       )
 
       BUILDAH_ARGS=()

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ spec:`
`365`	`365`
`366`	`366`	`dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" >/shared/parsed_dockerfile.json`
`367`	`367`	`BASE_IMAGES=$(`
`368`		`- jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not)' /shared/parsed_dockerfile.json`
	`368`	`+ jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not) \| sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json`
`369`	`369`	`)`
`370`	`370`
`371`	`371`	`BUILDAH_ARGS=()`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ spec:`
`399`	`399`
`400`	`400`	`dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" >/shared/parsed_dockerfile.json`
`401`	`401`	`BASE_IMAGES=$(`
`402`		`- jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not)' /shared/parsed_dockerfile.json`
	`402`	`+ jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not) \| sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json`
`403`	`403`	`)`
`404`	`404`
`405`	`405`	`BUILDAH_ARGS=()`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ spec:`
`375`	`375`
`376`	`376`	`dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" > /shared/parsed_dockerfile.json`
`377`	`377`	`BASE_IMAGES=$(`
`378`		`- jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not)' /shared/parsed_dockerfile.json`
	`378`	`+ jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not) \| sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json`
`379`	`379`	`)`
`380`	`380`
`381`	`381`	`BUILDAH_ARGS=()`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ spec:`
`296`	`296`
`297`	`297`	`dockerfile-json "${BUILD_ARG_FLAGS[@]}" "$dockerfile_copy" > /shared/parsed_dockerfile.json`
`298`	`298`	`BASE_IMAGES=$(`
`299`		`- jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not)' /shared/parsed_dockerfile.json`
	`299`	`+ jq -r '.Stages[] \| select(.From \| .Stage or .Scratch \| not) \| .BaseName \| select(test("^oci-archive:") \| not) \| sub("\"?(?<image>[^\"]*)\"?" ; .image)' /shared/parsed_dockerfile.json`
`300`	`300`	`)`
`301`	`301`
`302`	`302`	`BUILDAH_ARGS=()`