From cb9d8d6c139da67444c0c918b057b797b42c4bd1 Mon Sep 17 00:00:00 2001 From: Andreea-Lupu Date: Fri, 8 Apr 2022 16:17:55 +0300 Subject: [PATCH] update metrics/Dockerfile to match current binary name format Signed-off-by: Andreea-Lupu --- examples/metrics/Dockerfile | 6 +++--- examples/metrics/Dockerfile-minimal | 6 +++--- examples/metrics/Dockerfile-zxp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/metrics/Dockerfile b/examples/metrics/Dockerfile index ddc2270b..efb230c0 100644 --- a/examples/metrics/Dockerfile +++ b/examples/metrics/Dockerfile @@ -30,11 +30,11 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM scratch AS final +FROM gcr.io/distroless/base AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot /zot +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-linux-amd64 /usr/bin/zot COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json -ENTRYPOINT ["/zot"] +ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] CMD ["serve", "/etc/zot/config.json"] diff --git a/examples/metrics/Dockerfile-minimal b/examples/metrics/Dockerfile-minimal index 06ed11d6..08f3a659 100644 --- a/examples/metrics/Dockerfile-minimal +++ b/examples/metrics/Dockerfile-minimal @@ -22,11 +22,11 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM scratch AS final +FROM gcr.io/distroless/base AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-minimal /zot +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-linux-amd64-minimal /usr/bin/zot COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json -ENTRYPOINT ["/zot"] +ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5050 VOLUME ["/var/lib/registry"] CMD ["serve", "/etc/zot/config.json"] diff --git a/examples/metrics/Dockerfile-zxp b/examples/metrics/Dockerfile-zxp index ff723f49..69688074 100644 --- a/examples/metrics/Dockerfile-zxp +++ b/examples/metrics/Dockerfile-zxp @@ -23,9 +23,9 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but binary and default config file # --- -FROM scratch AS final -COPY --from=builder /go/src/github.com/project-zot/zot/bin/zxp /zxp +FROM gcr.io/distroless/base AS final +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zxp-linux-amd64 /usr/bin/zxp COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zxp/config.json -ENTRYPOINT ["/zxp"] +ENTRYPOINT ["/usr/bin/zxp"] EXPOSE 5051 CMD ["config", "/etc/zxp/config.json"]