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

Parameterize the repository key location

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-10-14 10:21:34 -07:00
parent 0c286045d3
commit 4a16344e22
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SOLUTION
View File

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

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

@ -9,11 +9,11 @@ RUN apt-get -q update \
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
# Fetch and install the signing key for OSGC's Agama repository # Fetch and install the signing key for OSGC's Agama repository
#RUN wget --no-proxy --quiet -O /tmp/repositories.key http://repositories.intel.com/graphics/ubuntu/repository.key \ 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 \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/repositories.key \
# && rm /tmp/repositories.key && rm /tmp/repositories.key
# Add internal Agama repository # Add internal Agama repository
RUN apt-add-repository "deb [trusted=yes arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main" RUN apt-add-repository "deb [arch=amd64] ${PACKAGE_REPOSITORY} ${OS_RELEASE} main"
RUN apt-get remove -y wget RUN apt-get remove -y wget