From b043347542be58b1de797baad935b255ca55fff4 Mon Sep 17 00:00:00 2001 From: Tanmay Satam Date: Wed, 6 Mar 2024 17:57:07 -0500 Subject: [PATCH] Rename azext-aro container for consistency with other CI containerfiles --- Dockerfile.aro-azext => Dockerfile.ci-azext-aro | 0 Makefile | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename Dockerfile.aro-azext => Dockerfile.ci-azext-aro (100%) diff --git a/Dockerfile.aro-azext b/Dockerfile.ci-azext-aro similarity index 100% rename from Dockerfile.aro-azext rename to Dockerfile.ci-azext-aro diff --git a/Makefile b/Makefile index 313032a0f1d..70e43fd1851 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ az: pyenv rm -f ~/.azure/commandIndex.json # https://github.com/Azure/azure-cli/issues/14997 azext-aro: - docker build . -f Dockerfile.aro-azext --no-cache=$(NO_CACHE) -t aro-azext:latest + docker build --platform=linux/amd64 . -f Dockerfile.ci-azext-aro --no-cache=$(NO_CACHE) -t azext-aro:latest clean: rm -rf python/az/aro/{aro.egg-info,build,dist} aro @@ -269,4 +269,4 @@ vendor: install-go-tools: go install ${GOTESTSUM} -.PHONY: admin.kubeconfig aks.kubeconfig aro az clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips install-go-tools +.PHONY: admin.kubeconfig aks.kubeconfig aro az azext-aro clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips install-go-tools