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

Moved base OS image from osgc-ubuntu to internally cached ubuntu

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-09-23 19:31:30 -07:00
parent 1434d551c2
commit dbe268a2e6
5 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@ -12,17 +12,14 @@
#
#
# Template begins here (from templates/templates/00-FROM.in)
# Template from templates/templates/00-FROM.in
#
# Creates a base OSGC Intel enabled Ubuntu image
#
# Derivatives include -dev variation which adds git, build-essentials,
# source repos, etc.
#
FROM amr-registry.caas.intel.com/vtt-osgc/os/osgc-ubuntu:disco
# Pull from the internal cache of images
FROM amr-registry.caas.intel.com/vtt-osgc/os/ubuntu:disco
#
# Template begins here (from templates/templates/05-intel-proxy.in)
# Template from templates/templates/05-intel-proxy.in
#
# Pre-install proxy configuration values
#
@ -35,7 +32,27 @@ RUN echo "Acquire::http::proxy \"http://proxy-chain.intel.com:911/\";\n" \
"Acquire::http::Proxy::osgc.jf.intel.com DIRECT;\n" > /etc/apt/apt.conf
#
# Template begins here (from templates/templates/10-default-packages.in)
# Template from templates/templates/08-intel-certs.in
#
# Install Intel CA5A cert so Intel certs are recognized
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
ca-certificates \
wget \
unzip \
&& mkdir -p /usr/local/share/ca-certificates \
&& wget -qO tmp.zip http://certificates.intel.com/repository/certificates/IntelSHA2RootChain-Base64.zip \
&& unzip tmp.zip -d /usr/local/share/ca-certificates \
&& rm tmp.zip \
&& wget -qO tmp.zip http://certificates.intel.com/repository/certificates/Intel%20Root%20Certificate%20Chain%20Base64.zip \
&& unzip tmp.zip -d /usr/local/share/ca-certificates \
&& rm tmp.zip \
&& update-ca-certificates --fresh
#
# Template from templates/templates/10-default-packages.in
#
# Update the repo lists and then install things using the internal
# sources. Packages used by many developers are pulled into this image
@ -58,7 +75,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 begins here (from templates/templates/20-create-agama-user.in)
# Template from templates/templates/20-create-agama-user.in
#
# Create user 'agama' and add them to 'sudo' for sudo access and set
# the passwd to 'agama'
@ -76,7 +93,7 @@ RUN groupadd -r agama \
RUN sed -i -e 's,%sudo.*,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
#
# Template begins here (from templates/templates/25-install-agama.in)
# Template from templates/templates/25-install-agama.in
#
# 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 \

2
scripts/build-dockerfile
View File

@ -29,7 +29,7 @@ for snippet in templates/??-*.in; do
cat << EOM >> Dockerfile
#
# Template $snippt begins here (from templates/${snippet})
# Template from templates/${snippet}
#
EOM
envsubst < $snippet >> Dockerfile

10
scripts/build-images
View File

@ -5,7 +5,15 @@
export $(grep -v '^#' SOLUTION | xargs -d '\n')
export $(grep -v '^#' MANIFEST | xargs -d '\n')
docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION}
docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION} || {
cat << EOM
Building docker image failed.
EOM
exit $?
}
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} ${CONTAINER}
cat << EOM

9
templates/00-FROM.in
View File

@ -1,6 +1,3 @@
# Creates a base OSGC Intel enabled Ubuntu image
#
# Derivatives include -dev variation which adds git, build-essentials,
# source repos, etc.
#
FROM amr-registry.caas.intel.com/vtt-osgc/os/osgc-$OS_DISTRO:$OS_RELEASE
# Pull from the internal cache of images
FROM amr-registry.caas.intel.com/vtt-osgc/os/$OS_DISTRO:$OS_RELEASE

16
templates/08-intel-certs.in Normal file
View File

@ -0,0 +1,16 @@
# Install Intel CA5A cert so Intel certs are recognized
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
ca-certificates \
wget \
unzip \
&& mkdir -p /usr/local/share/ca-certificates \
&& wget -qO tmp.zip http://certificates.intel.com/repository/certificates/IntelSHA2RootChain-Base64.zip \
&& unzip tmp.zip -d /usr/local/share/ca-certificates \
&& rm tmp.zip \
&& wget -qO tmp.zip http://certificates.intel.com/repository/certificates/Intel%20Root%20Certificate%20Chain%20Base64.zip \
&& unzip tmp.zip -d /usr/local/share/ca-certificates \
&& rm tmp.zip \
&& update-ca-certificates --fresh