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

Update to latest xe-solutions

Browse Source 
Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James P. Ketrenos 2021-07-13 16:27:11 -07:00
parent 4a155698af
commit 2ac00fa2ce
11 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/build-dockerfile.sh
View File

@ -34,9 +34,14 @@ The following Dockerfile.solutions were checked, but do not exist:
EOF
}
REGISTRY_OS_AMR=amr-registry.caas.intel.com/vtt-osgc/os/
export REGISTRY_OS=${REGISTRY_OS:-${REGISTRY_OS_AMR}}
if [[ "${REGISTRY_OS}" == "external" ]]; then
export REGISTRY_OS=
fi
export DOCKERFILE="Dockerfile${SOLUTION_SUFFIX}"
export SOLUTION="Dockerfile.solution${SOLUTION_SUFFIX}"
VARS+=(DOCKERFILE SOLUTION BUILD)
VARS+=(DOCKERFILE SOLUTION BUILD REGISTRY_OS)
if [[ "${BUILD}" != "" ]] && [[ "${BUILD}" != "N/A" ]]; then
# Override PACKAGE_REPOSITORY as it won't be used -- instead a file

2
templates/rhel/00-from.in
View File

@ -1,5 +1,5 @@
# Pull internal RHEL image
FROM amr-registry.caas.intel.com/vtt-osgc/os/rhel:${OS_RELEASE}.0 AS xe-base-stage
FROM ${REGISTRY_OS}rhel:${OS_RELEASE}.0 AS xe-base-stage
# Flush cached package lists to prevent stale data
RUN dnf clean all

2
templates/sles/08-install-gpg-keys.in
View File

@ -1 +1 @@
RUN zypper --gpg-auto-import-keys refresh
RUN zypper --non-interactive --gpg-auto-import-keys refresh

3
templates/sles/13-intel-certs.in
View File

@ -1,6 +1,7 @@
# Install Intel CA5A cert so Intel certs are recognized
RUN zypper -qn install --no-recommends -y unzip wget ca-certificates \
RUN zypper -qn --non-interactive install --no-recommends -y \
unzip wget ca-certificates \
&& wget -qO tmp.zip http://certificates.intel.com/repository/certificates/IntelSHA2RootChain-Base64.zip \
&& unzip -qo tmp.zip -d /etc/pki/trust/anchors \
&& rm tmp.zip \

2
templates/sles/15-suseconnect.in
View File

@ -1,3 +1,3 @@
# Add SUSEConnect
RUN zypper install -y SUSEConnect
RUN zypper --non-interactive install -y SUSEConnect

2
templates/sles/15sp1/00-from.in
View File

@ -1,3 +1,3 @@
# Pull internal sles 15sp1 image.
FROM amr-registry.caas.intel.com/vtt-osgc/os/sles:15.1 AS xe-base-stage
FROM ${REGISTRY_OS}sles:15.1 AS xe-base-stage

2
templates/sles/15sp2/00-from.in
View File

@ -1,3 +1,3 @@
# Pull internal sles 15sp2 image.
FROM amr-registry.caas.intel.com/vtt-osgc/os/sles:15.2 AS xe-base-stage
FROM ${REGISTRY_OS}sles:15.2 AS xe-base-stage

2
templates/sles/18-create-user.in
View File

@ -5,7 +5,7 @@ FROM xe-base-stage AS xe-user-stage
USER root
RUN zypper install -y sudo
RUN zypper --non-interactive install -y sudo
# NOTE: Requires 'sudo' package to already be installed.

2
templates/sles/20-local-file-intel-repo.in
View File

@ -6,7 +6,7 @@
# Prerequisites
#
RUN zypper install -y \
RUN zypper --non-interactive install -y \
curl \
tar \
createrepo_c \

2
templates/sles/30-clean-up.in.ignore
View File

@ -2,6 +2,6 @@
USER root
RUN zypper clean --all
RUN zypper --non-interactive clean --all
USER user

2
templates/ubuntu/00-from.in
View File

@ -1,3 +1,3 @@
# Pull from $OS_DISTRO on Docker Hub
FROM amr-registry.caas.intel.com/vtt-osgc/os/$OS_DISTRO:$OS_RELEASE AS xe-base-stage
FROM ${REGISTRY_OS}${OS_DISTRO}:${OS_RELEASE} AS xe-base-stage