DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert arch var name (#8808)

Browse source
This commit is contained in:
Ricardo Katz 2022-07-11 09:00:08 -03:00 committed by GitHub
parent caac91ce66
commit 771ce1c6dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -79,7 +79,7 @@ image: clean-image ## Build image for a particular arch.
--pull \ --pull \
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg BASE_IMAGE="$(BASE_IMAGE)" \
--build-arg VERSION="$(TAG)" \ --build-arg VERSION="$(TAG)" \
--build-arg TARGET_ARCH="$(ARCH)" \ --build-arg TARGETARCH="$(ARCH)" \
--build-arg COMMIT_SHA="$(COMMIT_SHA)" \ --build-arg COMMIT_SHA="$(COMMIT_SHA)" \
--build-arg BUILD_ID="$(BUILD_ID)" \ --build-arg BUILD_ID="$(BUILD_ID)" \
-t $(REGISTRY)/controller:$(TAG) rootfs -t $(REGISTRY)/controller:$(TAG) rootfs
@ -97,7 +97,7 @@ image-chroot: clean-chroot-image ## Build image for a particular arch.
--pull \ --pull \
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg BASE_IMAGE="$(BASE_IMAGE)" \
--build-arg VERSION="$(TAG)" \ --build-arg VERSION="$(TAG)" \
--build-arg TARGET_ARCH="$(ARCH)" \ --build-arg TARGETARCH="$(ARCH)" \
--build-arg COMMIT_SHA="$(COMMIT_SHA)" \ --build-arg COMMIT_SHA="$(COMMIT_SHA)" \
--build-arg BUILD_ID="$(BUILD_ID)" \ --build-arg BUILD_ID="$(BUILD_ID)" \
-t $(REGISTRY)/controller-chroot:$(TAG) rootfs -f rootfs/Dockerfile-chroot -t $(REGISTRY)/controller-chroot:$(TAG) rootfs -f rootfs/Dockerfile-chroot

2
TAG
View file

@ -1 +1 @@
v1.3.0 v1.3.0-beta.0

8
rootfs/Dockerfile
View file

@ -16,7 +16,7 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}
ARG TARGET_ARCH ARG TARGETARCH
ARG VERSION ARG VERSION
ARG COMMIT_SHA ARG COMMIT_SHA
ARG BUILD_ID=UNSET 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 etc /etc
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/dbg / COPY --chown=www-data:www-data bin/${TARGETARCH}/dbg /
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/nginx-ingress-controller / COPY --chown=www-data:www-data bin/${TARGETARCH}/nginx-ingress-controller /
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/wait-shutdown / COPY --chown=www-data:www-data bin/${TARGETARCH}/wait-shutdown /
# Fix permission during the build to avoid issues at runtime # Fix permission during the build to avoid issues at runtime
# with volumes (custom templates) # with volumes (custom templates)

8
rootfs/Dockerfile-chroot
View file

@ -25,7 +25,7 @@ RUN apk update \
FROM alpine:3.16.0 FROM alpine:3.16.0
ARG TARGET_ARCH ARG TARGETARCH
ARG VERSION ARG VERSION
ARG COMMIT_SHA ARG COMMIT_SHA
ARG BUILD_ID=UNSET 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 etc /chroot/etc
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/dbg / COPY --chown=www-data:www-data bin/${TARGETARCH}/dbg /
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/nginx-ingress-controller / COPY --chown=www-data:www-data bin/${TARGETARCH}/nginx-ingress-controller /
COPY --chown=www-data:www-data bin/${TARGET_ARCH}/wait-shutdown / COPY --chown=www-data:www-data bin/${TARGETARCH}/wait-shutdown /
COPY --chown=www-data:www-data nginx-chroot-wrapper.sh /usr/bin/nginx COPY --chown=www-data:www-data nginx-chroot-wrapper.sh /usr/bin/nginx
WORKDIR /chroot/etc/nginx WORKDIR /chroot/etc/nginx