revert arch var name (kubernetes#8808)

joomcode · May 17, 2023 · fbd19b8 · fbd19b8
1 parent 8602cad
commit fbd19b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -79,7 +79,7 @@ image: clean-image ## Build image for a particular arch.
 		--pull \
 		--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
 		--build-arg VERSION="$(TAG)" \
-		--build-arg TARGET_ARCH="$(ARCH)" \
+		--build-arg TARGETARCH="$(ARCH)" \
 		--build-arg COMMIT_SHA="$(COMMIT_SHA)" \
 		--build-arg BUILD_ID="$(BUILD_ID)" \
 		-t $(REGISTRY)/controller:$(TAG) rootfs
@@ -97,7 +97,7 @@ image-chroot: clean-chroot-image ## Build image for a particular arch.
 		--pull \
 		--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
 		--build-arg VERSION="$(TAG)" \
-		--build-arg TARGET_ARCH="$(ARCH)" \
+		--build-arg TARGETARCH="$(ARCH)" \
 		--build-arg COMMIT_SHA="$(COMMIT_SHA)" \
 		--build-arg BUILD_ID="$(BUILD_ID)" \
 		-t $(REGISTRY)/controller-chroot:$(TAG) rootfs -f rootfs/Dockerfile-chroot

diff --git a/TAG b/TAG
@@ -1 +1 @@
-v1.3.0
+v1.3.0-beta.0
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
@@ -16,7 +16,7 @@ ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE}
 
-ARG TARGET_ARCH
+ARG TARGETARCH
 ARG VERSION
 ARG COMMIT_SHA
 ARG BUILD_ID=UNSET
@@ -41,9 +41,9 @@ RUN apk update \
 
 COPY --chown=www-data:www-data etc /etc
 
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/dbg /
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/nginx-ingress-controller /
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/wait-shutdown /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/dbg /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/nginx-ingress-controller /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/wait-shutdown /
 
 # Fix permission during the build to avoid issues at runtime
 # with volumes (custom templates)

diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot
@@ -25,7 +25,7 @@ RUN apk update \
 
 FROM alpine:3.16.0
 
-ARG TARGET_ARCH
+ARG TARGETARCH
 ARG VERSION
 ARG COMMIT_SHA
 ARG BUILD_ID=UNSET
@@ -64,9 +64,9 @@ COPY --from=chroot /chroot /chroot
 
 COPY --chown=www-data:www-data etc /chroot/etc
 
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/dbg /
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/nginx-ingress-controller /
-COPY --chown=www-data:www-data bin/${TARGET_ARCH}/wait-shutdown /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/dbg /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/nginx-ingress-controller /
+COPY --chown=www-data:www-data bin/${TARGETARCH}/wait-shutdown /
 COPY --chown=www-data:www-data nginx-chroot-wrapper.sh /usr/bin/nginx
 
 WORKDIR /chroot/etc/nginx