From ebd2948b0744bcdcf8ee1d5e286f64d4cd3a9014 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Fri, 26 Jan 2024 18:06:52 -0300 Subject: [PATCH] rollback image from scratch --- rootfs/Dockerfile | 6 +----- rootfs/Dockerfile-chroot | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index b3b98c0a95..a04cfe3dec 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -14,7 +14,7 @@ ARG BASE_IMAGE -FROM ${BASE_IMAGE} as builder +FROM ${BASE_IMAGE} ARG TARGETARCH ARG VERSION @@ -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"] diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot index 4af8dade5e..494e2baae8 100644 --- a/rootfs/Dockerfile-chroot +++ b/rootfs/Dockerfile-chroot @@ -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 @@ -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"]