From 36ce0f8bb04405c53bd0bf1f98394097ac1623e5 Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani Date: Thu, 10 Feb 2022 21:38:37 +0000 Subject: [PATCH] ci/cd: fix image upload pipeline Signed-off-by: Ramkumar Chinchani --- Dockerfile | 2 ++ Dockerfile-minimal | 2 ++ Dockerfile-zb | 2 ++ Dockerfile-zxp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index 06f9ce7cd..5ff467476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,8 @@ RUN echo '{\n\ # Stage 2: Final image with nothing but certs, binary, and default config file # --- FROM scratch AS final +ARG OS +ARG ARCH 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-$OS-$ARCH /usr/bin/zot COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json diff --git a/Dockerfile-minimal b/Dockerfile-minimal index 566b190a0..862a1a5ac 100644 --- a/Dockerfile-minimal +++ b/Dockerfile-minimal @@ -26,6 +26,8 @@ RUN echo '{\n\ # Stage 2: Final image with nothing but certs, binary, and default config file # --- FROM scratch AS final +ARG OS +ARG ARCH 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-$OS-$ARCH-minimal /usr/bin/zot COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json diff --git a/Dockerfile-zb b/Dockerfile-zb index b055db14c..235c8eb8a 100644 --- a/Dockerfile-zb +++ b/Dockerfile-zb @@ -14,5 +14,7 @@ RUN make COMMIT=$COMMIT OS=$OS ARCH=$ARCH clean bench # Stage 2: Final image with nothing but certs, binary, and default config file # --- FROM scratch AS final +ARG OS +ARG ARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zb-$OS-$ARCH /usr/bin/zb ENTRYPOINT ["/usr/bin/zb"] diff --git a/Dockerfile-zxp b/Dockerfile-zxp index ff84499b4..c26394d2a 100644 --- a/Dockerfile-zxp +++ b/Dockerfile-zxp @@ -27,6 +27,8 @@ RUN echo '{\n\ # Stage 2: Final image with nothing but binary and default config file # --- FROM scratch AS final +ARG OS +ARG ARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zxp-$OS-$ARCH /zxp COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zxp/config.json ENTRYPOINT ["/zxp"]