From 47112810e786c92aa271e899f810998b95e03999 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 15 Oct 2019 13:30:52 -0700 Subject: [PATCH] Move asset/ copying and entrypoint into boilerplate template/ending.in instead of Dockerfile.solution Signed-off-by: James Ketrenos --- Dockerfile.solution | 5 ----- templates/ending.in | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.solution b/Dockerfile.solution index f921591..ec4da84 100644 --- a/Dockerfile.solution +++ b/Dockerfile.solution @@ -56,12 +56,7 @@ RUN apt-get -q update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* - -COPY assets/ /assets/ - # Copy ffmpeg and ffprobe from build container COPY --from=solution-build /usr/local/bin/ /usr/local/bin/ WORKDIR /home/agama - -ENTRYPOINT [ "/assets/entry" ] diff --git a/templates/ending.in b/templates/ending.in index 79447e3..3ea4036 100644 --- a/templates/ending.in +++ b/templates/ending.in @@ -3,6 +3,11 @@ # changes,) causing all subsequent layers to be # regenerated. + +# Copy boiler plate entry point +COPY assets/ /assets/ +ENTRYPOINT [ "/assets/entry" ] + # Ensure that each Docker container self-documents the # versions included in it