From fbd19b821fa2145b9ad94ef65f56c55fe2e86d8a Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Mon, 11 Jul 2022 09:00:08 -0300 Subject: [PATCH] revert arch var name (#8808) --- Makefile | 4 ++-- TAG | 2 +- rootfs/Dockerfile | 8 ++++---- rootfs/Dockerfile-chroot | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e56457a0dc..6509590e8c 100644 --- 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 index 8b3a0227b4..50ace7512e 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -v1.3.0 \ No newline at end of file +v1.3.0-beta.0 \ No newline at end of file diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 4df7511eef..62c9bd0b6a 100644 --- 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 index 2de47a71e8..69d2a0f712 100644 --- 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