update AZ, ad RADIX_ZONE to make test (#46)

* update AZ, ad RADIX_ZONE to make test * fix bug in dockerfile --------- Co-authored-by: Richard Hagen <[email protected]>
equinor · Jan 5, 2024 · 8b60094 · 8b60094
1 parent b4f3391
commit 8b60094
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM mcr.microsoft.com/azure-cli:2.38.0
+FROM mcr.microsoft.com/azure-cli:2.55.0
+RUN apk add --no-cache git
 WORKDIR /radix-image-builder/
 COPY build_acr.sh build_acr.sh
 
@@ -14,4 +15,3 @@ ENV TENANT=3aa4a235-b6e2-48d5-9195-7fcf05b459b0 \
 RUN chmod +x /radix-image-builder/build_acr.sh && git config --system --add safe.directory '*'
 USER 1000
 ENTRYPOINT [ "/radix-image-builder/build_acr.sh"]
-CMD ["-c"]
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ test:
 		-e CLUSTERNAME_IMAGE=radixdev.azurecr.io/radix-image-builder-test:3 \
 		-e SUBSCRIPTION_ID=16ede44b-1f74-40a5-b428-46cca9a5741b \
 		-e BRANCH=main \
+		-e RADIX_ZONE=dev \
 		-e TARGET_ENVIRONMENTS=dev,qa \
 		radixdev.azurecr.io/radix-image-builder:dev
 	rm ./test/credentials.json
@@ -22,4 +23,4 @@ push-dev:
 	docker push radixdev.azurecr.io/radix-image-builder:dev
 
 run-test-image:
-	docker run radixdev.azurecr.io/radix-image-builder-test:1
+	docker run radixdev.azurecr.io/radix-image-builder-test:1