Merge pull request #99022 from vinayakankugoyal/dockerfile2

Use ARG instead of sed in the conformance image.

cluster/images/conformance/Dockerfile

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM BASEIMAGE
+ARG BASEIMAGE
+
+FROM ${BASEIMAGE}
 
 COPY ginkgo /usr/local/bin/
 COPY e2e.test /usr/local/bin/

cluster/images/conformance/Makefile

@@ -54,13 +54,12 @@ endif
 	chmod a+rx ${TEMP_DIR}/e2e.test
 	chmod a+rx ${TEMP_DIR}/gorunner
 
-	cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
-
 	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \
 		--platform linux/${ARCH} \
 		--load \
 		--pull \
 		-t ${REGISTRY}/conformance-${ARCH}:${VERSION} \
+		--build-arg BASEIMAGE=$(BASEIMAGE) \
 		${TEMP_DIR}
 	rm -rf "${TEMP_DIR}"