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

Update to latest xe-solutions

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2021-07-14 16:13:15 -07:00
parent 2ac00fa2ce
commit 42f092c1eb
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Dockerfile
View File

@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1.2
# Enable secrets
#
# DO NOT EDIT THIS DOCKERFILE
#
@ -18,17 +20,6 @@
FROM amr-registry.caas.intel.com/vtt-osgc/os/ubuntu:focal AS xe-base-stage
#
# Template from templates/01-env.in
#
# Configure ENV variables which are set by scripts/build-dockerfile.sh
# and available in the container for use in assets/entry
ENV GPGPU_PACKAGE_REPOSITORY "https://osgc.jf.intel.com/internal"
ENV GPGPU_PACKAGE_STREAM "focal"
ENV GPGPU_PACKAGE_DISTRO "ubuntu"
ENV GPGPU_PACKAGE_DISTRO_RELEASE "focal"
#
# Template from templates/ubuntu/05-intel-proxy.in
#
@ -110,30 +101,7 @@ RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8
#
# Template from templates/ubuntu/20-repositories-intel-com.in
#
# Update and install wget and 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
# Fetch and install the signing key for https://osgc.jf.intel.com/internal
#
RUN wget -qO - https://osgc.jf.intel.com/internal/intel-graphics.key | apt-key add -
RUN apt-add-repository \
'deb [arch=amd64] https://osgc.jf.intel.com/internal/ubuntu focal main'
# Cleanup
#RUN apt-get remove -y wget \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
#
# Template from templates/ubuntu/25-create-user.in
# Template from templates/ubuntu/18-create-user.in
#
# Create user 'user' and add them to 'sudo' for sudo access and set
# the passwd to 'user'
@ -166,6 +134,40 @@ RUN sed -i -e 's,%sudo.*,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
#
# Template from templates/ubuntu/20-repositories-intel-com.in
#
# Update and install wget and 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
# Fetch and install the signing key for https://osgc.jf.intel.com/internal
#
RUN wget -qO - https://osgc.jf.intel.com/internal/intel-graphics.key | apt-key add -
RUN apt-add-repository \
'deb [arch=amd64] https://osgc.jf.intel.com/internal/ubuntu focal-prerelease-untested main'
# Cleanup
#RUN apt-get remove -y wget \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
#
# Template from templates/99-env.in
#
# Configure ENV variables which are set by scripts/build-dockerfile.sh
# and available in the container for use in assets/entry
ENV GPGPU_PACKAGE_REPOSITORY "https://osgc.jf.intel.com/internal"
ENV GPGPU_PACKAGE_STREAM "focal-prerelease-untested"
ENV GPGPU_PACKAGE_DISTRO "ubuntu"
ENV GPGPU_PACKAGE_DISTRO_RELEASE "focal"
USER user
#

3
templates/ubuntu/05-intel-proxy.in
View File

@ -9,6 +9,9 @@ RUN { \
done \
} > /etc/apt/sources.list
# Retry downloads up to 100 times to work around linux-ftp issue...
RUN echo 'APT::Acquire::Retries "100";' > /etc/apt/apt.conf.d/80-retries
ARG http_proxy="http://proxy-chain.intel.com:911/"
ARG https_proxy="http://proxy-chain.intel.com:912/"
ARG ftp_proxy="ftp://proxy-chain.intel.com:911/"