Skip to content

Commit

Permalink
rollback image from scratch
Browse files Browse the repository at this point in the history
  • Loading branch information
rikatz committed Jan 26, 2024
1 parent 8a51622 commit ebd2948
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
6 changes: 1 addition & 5 deletions rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

ARG BASE_IMAGE

FROM ${BASE_IMAGE} as builder
FROM ${BASE_IMAGE}

ARG TARGETARCH
ARG VERSION
Expand Down Expand Up @@ -83,9 +83,5 @@ USER www-data
RUN ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log

FROM scratch
COPY --from=builder / /

USER www-data
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/nginx-ingress-controller"]
5 changes: 1 addition & 4 deletions rootfs/Dockerfile-chroot
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apk update \
&& apk upgrade \
&& /chroot.sh

FROM alpine:3.19.0 as builder
FROM alpine:3.19.0

ARG TARGETARCH
ARG VERSION
Expand Down Expand Up @@ -116,12 +116,9 @@ RUN mkdir -p /chroot/modules_mount \
&& mkdir -p modules_mount \
&& ln -s /modules_mount /chroot/modules_mount

FROM scratch

USER www-data

EXPOSE 80 443
COPY --from=builder / /
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

CMD ["/nginx-ingress-controller"]
Expand Down

0 comments on commit ebd2948

Please sign in to comment.