jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

Updated Dockerfile from latest templates/

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-10-15 13:31:09 -07:00
parent 47112810e7
commit dddbed6fd5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -63,10 +63,13 @@ RUN apt-get -q update \
# #
# NOTE: We use DEBIAN_FRONTEND=noninteractive to prevent krb5-user from # NOTE: We use DEBIAN_FRONTEND=noninteractive to prevent krb5-user from
# trying to prompt for configuration details during install. # trying to prompt for configuration details during install.
#
# pciutils is needed for lspci used by assets/agama-hw
RUN apt-get -q update \ RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -q \
locales \ locales \
software-properties-common software-properties-common \
pciutils
# Set up locales # Set up locales
RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 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 \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY assets/ /assets/
# Copy ffmpeg and ffprobe from build container # Copy ffmpeg and ffprobe from build container
COPY --from=solution-build /usr/local/bin/ /usr/local/bin/ COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
WORKDIR /home/agama WORKDIR /home/agama
ENTRYPOINT [ "/assets/entry" ]
# #
# Standard ending begins here (from templates/ending.in) # Standard ending begins here (from templates/ending.in)
# #
@ -208,6 +206,11 @@ ENTRYPOINT [ "/assets/entry" ]
# changes,) causing all subsequent layers to be # changes,) causing all subsequent layers to be
# regenerated. # regenerated.
# Copy boiler plate entry point
COPY assets/ /assets/
ENTRYPOINT [ "/assets/entry" ]
# Ensure that each Docker container self-documents the # Ensure that each Docker container self-documents the
# versions included in it # versions included in it