diff --git a/cluster/images/conformance/Dockerfile b/cluster/images/conformance/Dockerfile index 0fc607f994b..2466bbace45 100644 --- a/cluster/images/conformance/Dockerfile +++ b/cluster/images/conformance/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=linux/ARCH BASEIMAGE +FROM BASEIMAGE COPY ginkgo /usr/local/bin/ COPY e2e.test /usr/local/bin/ diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index c2284d1fb12..35ae5147889 100644 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -54,9 +54,14 @@ endif chmod a+rx ${TEMP_DIR}/e2e.test chmod a+rx ${TEMP_DIR}/gorunner - cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g; s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile + cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile - docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR} + docker buildx build \ + --platform linux/${ARCH} \ + --load \ + --pull \ + -t ${REGISTRY}/conformance-${ARCH}:${VERSION} \ + ${TEMP_DIR} rm -rf "${TEMP_DIR}" push: build