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

Switch to osgc.jf.intel.com/graphics/ubuntu for repo

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-10-14 16:28:38 -07:00
parent d4ec413c2a
commit e74e131e8b
4 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Dockerfile
View File

@ -77,23 +77,31 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8
#
FROM base AS agama
# Once we have a signed repository:
#
# Update and install gpg-agent as it isn't in the base Ubuntu image and is needed for apt-key
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
wget \
gpg-agent \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
#RUN apt-get -q update \
# && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
# wget \
# gpg-agent \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
# Fetch and install the signing key for OSGC's Agama repository
RUN wget --no-proxy --quiet -O /tmp/repositories.key http://osgc.jf.intel.com/packages/agama/ubuntu/aptly_repo_signing.key \
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
&& rm /tmp/repositories.key
# Fetch and install the signing key for repositories.intel.com
#RUN wget --no-proxy --quiet -O /tmp/repositories.key http://osgc.jf.intel.com/graphics/ubuntu/aptly_repo_signing.key \
# && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
# && rm /tmp/repositories.key
# Add the repository
#RUN apt-add-repository "deb [trusted=yes arch=amd64] http://osgc.jf.intel.com/graphics/ubuntu disco main"
# Cleanup
#RUN apt-get remove -y wget
# Install repository as trusted until we have a signed repository:
RUN echo "deb [trusted=yes arch=amd64] http://osgc.jf.intel.com/graphics/ubuntu disco main" > /etc/apt/sources.list.d/intel-graphics.list
# Add internal Agama repository
RUN apt-add-repository "deb [arch=amd64] http://osgc.jf.intel.com/packages/agama/ubuntu disco main"
RUN apt-get remove -y wget
#
# Template from templates/templates/25-agama-user.in
@ -174,7 +182,6 @@ ENV LIBVA_DRIVER_NAME=iHD
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
intel-media-va-driver-non-free=19.3.pre4.agama-198 \
libigdgmm11 \
libva2=2.6.0.agama-198 \
libmfx1=19.2.pre3.agama-198 \
vainfo=2.6.0.agama-198 \

1
Dockerfile.solution
View File

@ -48,7 +48,6 @@ ENV LIBVA_DRIVER_NAME=iHD
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
intel-media-va-driver-non-free$INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION \
libigdgmm11$LIBIGDGMM11_VERSION \
libva2$LIBVA2_VERSION \
libmfx1$LIBMFX1_VERSION \
vainfo$VAINFO_VERSION \

4
SOLUTION
View File

@ -3,7 +3,7 @@ CONTAINER=intel-media-ffmpeg
OS_DISTRO=ubuntu
OS_RELEASE=disco
FFMPEG_TAG_VERSION=n4.2.1
PACKAGE_KEYFILE=http://osgc.jf.intel.com/packages/agama/ubuntu/aptly_repo_signing.key
PACKAGE_REPOSITORY=http://osgc.jf.intel.com/packages/agama/${OS_DISTRO}
PACKAGE_KEYFILE=http://osgc.jf.intel.com/graphics/ubuntu/aptly_repo_signing.key
PACKAGE_REPOSITORY=http://osgc.jf.intel.com/graphics/${OS_DISTRO}
#PACKAGE_KEYFILE=http://repositories.intel.com/graphics/ubuntu/repository.key
#PACKAGE_REPOSITORY=http://repositories.intel.com/graphics/${OS_DISTRO}

34
templates/20-agama-packages.in
View File

@ -1,19 +1,27 @@
FROM base AS agama
# Once we have a signed repository:
#
# Update and install gpg-agent as it isn't in the base Ubuntu image and is needed for apt-key
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
wget \
gpg-agent \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
#RUN apt-get -q update \
# && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
# wget \
# gpg-agent \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
# Fetch and install the signing key for OSGC's Agama repository
RUN wget --no-proxy --quiet -O /tmp/repositories.key ${PACKAGE_KEYFILE} \
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
&& rm /tmp/repositories.key
# Fetch and install the signing key for repositories.intel.com
#RUN wget --no-proxy --quiet -O /tmp/repositories.key ${PACKAGE_KEYFILE} \
# && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
# && rm /tmp/repositories.key
# Add the repository
#RUN apt-add-repository "deb [trusted=yes arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
# Cleanup
#RUN apt-get remove -y wget
# Install repository as trusted until we have a signed repository:
RUN echo "deb [trusted=yes arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main" > /etc/apt/sources.list.d/intel-graphics.list
# Add internal Agama repository
RUN apt-add-repository "deb [arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
RUN apt-get remove -y wget