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

Install curl and use it to download content (rhel 8.0 has curl)

Browse Source 
Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James P. Ketrenos 2020-01-28 11:07:22 -08:00
parent 78496afb01
commit f83bce7178
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.solution
View File

@ -51,6 +51,9 @@ USER root
# #
# NOTE: libva requires libpciaccess0, however it doesn't depend on it # NOTE: libva requires libpciaccess0, however it doesn't depend on it
# so explicitly install it. # so explicitly install it.
#
# curl is used by assets/commands/test to obtain test content if it
# does not already exist
RUN apt-get -q update \ RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive \ && DEBIAN_FRONTEND=noninteractive \
&& apt-get --no-install-recommends -q -y install \ && apt-get --no-install-recommends -q -y install \
@ -59,7 +62,8 @@ RUN apt-get -q update \
libmfx1$LIBMFX1_VERSION \ libmfx1$LIBMFX1_VERSION \
vainfo$VAINFO_VERSION \ vainfo$VAINFO_VERSION \
libpciaccess0 \ libpciaccess0 \
pciutils pciutils \
curl
# 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/

2
assets/commands/test
View File

@ -105,7 +105,7 @@ Test file h264 (AVC) not found. Attempting to download to /data
EOF EOF
wget -O /data/AUD_MW_E.264 \\ curl -so /data/AUD_WM_E.264 \
'https://fate-suite.libav.org/h264-conformance/AUD_MW_E.264' || { 'https://fate-suite.libav.org/h264-conformance/AUD_MW_E.264' || {
2>&1 cat << EOF 2>&1 cat << EOF