From dddbed6fd5bef35cdc606f25da35a5522eb7f3f6 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 15 Oct 2019 13:31:09 -0700 Subject: [PATCH] Updated Dockerfile from latest templates/ Signed-off-by: James Ketrenos --- Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f028245..cb2b08c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,10 +63,13 @@ RUN apt-get -q update \ # # NOTE: We use DEBIAN_FRONTEND=noninteractive to prevent krb5-user from # trying to prompt for configuration details during install. +# +# pciutils is needed for lspci used by assets/agama-hw RUN apt-get -q update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -q \ locales \ - software-properties-common + software-properties-common \ + pciutils # Set up locales RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 @@ -190,16 +193,11 @@ 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" ] - # # Standard ending begins here (from templates/ending.in) # @@ -208,6 +206,11 @@ ENTRYPOINT [ "/assets/entry" ] # 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