From 1593c6fd16250712b2e43b34646387d4dc206904 Mon Sep 17 00:00:00 2001 From: ston1th Date: Fri, 18 Jan 2019 23:31:49 +0100 Subject: [PATCH] fixed srv --- Dockerfile.db | 6 +++--- Dockerfile.srv | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.db b/Dockerfile.db index da251fe..42367f6 100644 --- a/Dockerfile.db +++ b/Dockerfile.db @@ -1,11 +1,11 @@ FROM alpine -ADD db /db +ADD db /main RUN echo -e "root:x:0:0:root:/:\nappuser:x:1000:1000:appuser:/:" > /etc/passwd RUN echo -e "root:x:0:root\nappuser:x:1000:" > /etc/group FROM scratch -COPY --from=0 /db /db +COPY --from=0 /main /main COPY --from=0 /etc/passwd /etc/ COPY --from=0 /etc/group /etc/ USER appuser EXPOSE 8080 -ENTRYPOINT ["/db"] +ENTRYPOINT ["/main"] diff --git a/Dockerfile.srv b/Dockerfile.srv index 3699ee1..200486d 100644 --- a/Dockerfile.srv +++ b/Dockerfile.srv @@ -1,11 +1,11 @@ FROM alpine -ADD srv /srv +ADD srv /main RUN echo -e "root:x:0:0:root:/:\nappuser:x:1000:1000:appuser:/:" > /etc/passwd RUN echo -e "root:x:0:root\nappuser:x:1000:" > /etc/group -FROM alpine -COPY --from=0 /srv /srv +FROM scratch +COPY --from=0 /main /main COPY --from=0 /etc/passwd /etc/ COPY --from=0 /etc/group /etc/ USER appuser EXPOSE 8080 -ENTRYPOINT ["/srv"] +ENTRYPOINT ["/main"]