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

Update nginx base image in one place (#8400)

Browse source 
* update files to use one base image file

Signed-off-by: James Strong <strong.james.e@gmail.com>

* add chart test as well

Signed-off-by: James Strong <strong.james.e@gmail.com>

* update e2e-test image building

Signed-off-by: James Strong <strong.james.e@gmail.com>

* update e2e base image arg

Signed-off-by: James Strong <strong.james.e@gmail.com>

* add current e2e so test run

Signed-off-by: James Strong <strong.james.e@gmail.com>

* working on fixing build

* getting dev-env and make release to work

* test

* i think buildx is working on mac

* updates

* why docker for mac and linux cli differ

* fix target arch

* fix target arch

* fix loag issue

* fix issue

* update the chroot docker file

* fix docker base build

* mac is the issue

* env not getting to the e2e deployment.go file

* fix pull issue

* fix pull issue

* move test scripts into test folder

* clean up ci

* updates for PR

* remove unnesscary var
This commit is contained in:
James Strong 2022-07-08 12:27:47 -04:00 • committed by GitHub
parent 8baac4214a
commit e1a16f6e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 138 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rootfs/Dockerfile
View file

@ -16,7 +16,7 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG TARGETARCH
ARG TARGET_ARCH
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/${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 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 /
# Fix permission during the build to avoid issues at runtime
# with volumes (custom templates)

8
rootfs/Dockerfile.chroot → rootfs/Dockerfile-chroot
View file

@ -25,7 +25,7 @@ RUN apk update \
FROM alpine:3.16.0
ARG TARGETARCH
ARG TARGET_ARCH
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/${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 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 nginx-chroot-wrapper.sh /usr/bin/nginx
WORKDIR /chroot/etc/nginx