Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert arch var name #8808

Merged
merged 1 commit into from
Jul 11, 2022
Merged

revert arch var name #8808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.3.0
v1.3.0-beta.0
8 changes: 4 additions & 4 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ARG BASE_IMAGE

FROM ${BASE_IMAGE}

ARG TARGET_ARCH
ARG TARGETARCH
ARG VERSION
ARG COMMIT_SHA
ARG BUILD_ID=UNSET
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions rootfs/Dockerfile-chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down