Updated to latest xe-solutions

Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>

.dockerignore

@@ -2,5 +2,4 @@
 !assets
 !Dockerfile*
 !SOLUTION
-!MANIFEST
 Dockerfile.solution*

Dockerfile

@@ -25,7 +25,7 @@ FROM ubuntu:focal AS xe-base-stage
 # 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-devel-dg1"
+ENV GPGPU_PACKAGE_STREAM "focal"
 ENV GPGPU_PACKAGE_DISTRO "ubuntu"
 ENV GPGPU_PACKAGE_DISTRO_RELEASE "focal"
 
@@ -136,7 +136,7 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8
 # below:
 
 # Install repository as trusted until we have a signed repository:
-RUN echo "deb [trusted=yes arch=amd64] https://osgc.jf.intel.com/internal/ubuntu focal-devel-dg1 main" > /etc/apt/sources.list.d/intel-graphics.list
+RUN echo "deb [trusted=yes arch=amd64] https://osgc.jf.intel.com/internal/ubuntu focal main" > /etc/apt/sources.list.d/intel-graphics.list
 
 # Cleanup
 #RUN apt-get remove -y wget
@@ -222,7 +222,7 @@ RUN git clone --depth 1 --branch n4.2.1 https://github.com/ffmpeg/ffmpeg /home/u
 # Build FFmpeg
 WORKDIR /home/user/ffmpeg
 
-RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \
+RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \
   && make -j $(nproc --all) \
   && sudo make install
 
@@ -279,5 +279,4 @@ ENTRYPOINT [ "/assets/entry" ]
 # Ensure that each Docker container self-documents the 
 # versions included in it
 COPY SOLUTION /assets/
-COPY MANIFEST /assets/
 COPY Dockerfile /assets/Dockerfile

README.md

@@ -55,7 +55,7 @@ docker run \
   --group-add ${VIDEO} \
   --device=/dev/dri \
   --volume $(pwd)/data:/data \
-  amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:ubuntu-eoan \
+  amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:ubuntu-focal \
   ffmpeg \
     -hwaccel qsv \
     -qsv_device ${QSV_DEVICE:-/dev/dri/renderD128} \
@@ -77,7 +77,7 @@ Intel's Harbor instance.
 
 ```bash
 export OS_DISTRO=ubuntu
-export PACKAGE_STREAM=eoan
+export PACKAGE_STREAM=focal
 TAG=${OS_DISTRO}-${PACKAGE_STREAM}
 docker pull amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${TAG}
 docker tag amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${TAG} intel-media-ffmpeg
@@ -85,15 +85,15 @@ docker tag amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${T
 
 ## Build Ubuntu container
 
-NOTE: Ubuntu 19.10 eoan packages have not been pushed to 
+NOTE: Ubuntu 19.10 focal packages have not been pushed to 
 repositories.intel.com yet. 'PACKAGE_REPOSITORY' is set to 
 osgc.jf.intel.com/internal below until the packages are published (by 
 end of November'19)
 
 ```bash
 export OS_DISTRO=ubuntu
-export OS_RELEASE=eoan
+export OS_RELEASE=focal
-export PACKAGE_STREAM=eoan
+export PACKAGE_STREAM=focal
 export PACKAGE_REPOSITORY=https://osgc.jf.intel.com/internal
 export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d)
 scripts/build-dockerfile.sh

SOLUTION

@@ -1,4 +1,4 @@
-# Until eoan is published to repositories.intel.com, use the
+# Until focal is published to repositories.intel.com, use the
 # internal repository hosted on osgc.jf.intel.com/internal
 PACKAGE_REPOSITORY=${PACKAGE_REPOSITORY:-https://osgc.jf.intel.com/internal}
 
@@ -7,7 +7,7 @@ REGISTRY_URL=${REGISTRY_URL:-amr-registry.caas.intel.com/vtt-osgc/solutions}
 RELEASE_INFO=${RELEASE_INFO:-N/A}
 CONTAINER="intel-media-ffmpeg"
 OS_DISTRO=${OS_DISTRO:-ubuntu}
-OS_RELEASE=${OS_RELEASE:-eoan}
+OS_RELEASE=${OS_RELEASE:-focal}
 PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}}
 #PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}-devel}
 PACKAGE_REPOSITORY=${PACKAGE_REPOSITORY:-https://repositories.intel.com/graphics}

assets/entry

@@ -16,7 +16,6 @@ for file in assets/commands/*; do
 done
 
 . /assets/SOLUTION
-. /assets/MANIFEST
 . /etc/os-release
 
 name() {
@@ -39,7 +38,6 @@ info() {
 $(name)
 
 Container base OS  : ${NAME} ${VERSION}
-Release information: ${RELEASE_INFO}
 Detected hardware  : ${HW}
 Package repository : ${GPGPU_PACKAGE_REPOSITORY}
 Package stream     : ${GPGPU_PACKAGE_STREAM}

scripts/build-dockerfile.sh

@@ -3,10 +3,8 @@
 # Bring in the variables from SOLUTION file, supporting
 # nested substitution
 . SOLUTION
-. MANIFEST
 
 VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
 for var in ${VARS[@]}; do
   export ${var}
 done

scripts/build-image.sh

@@ -3,10 +3,8 @@
 # Bring in the variables from SOLUTION file, supporting
 # nested substitution
 . SOLUTION
-. MANIFEST
 
 VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
 for var in ${VARS[@]}; do
   export ${var}
 done

scripts/promote-image.sh

@@ -3,10 +3,8 @@
 # Bring in the variables from SOLUTION file, supporting
 # nested substitution
 . SOLUTION
-. MANIFEST
 
 VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
 for var in ${VARS[@]}; do
   export ${var}
 done

scripts/push-image.sh

@@ -3,10 +3,8 @@
 # Bring in the variables from SOLUTION file, supporting
 # nested substitution
 . SOLUTION
-. MANIFEST
 
 VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
 for var in ${VARS[@]}; do
   export ${var}
 done

templates/ending.in

@@ -10,5 +10,4 @@ ENTRYPOINT [ "/assets/entry" ]
 # Ensure that each Docker container self-documents the 
 # versions included in it
 COPY SOLUTION /assets/
-COPY MANIFEST /assets/
 COPY ${DOCKERFILE} /assets/Dockerfile

templates/rhel/00-from.in

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

templates/sles/15sp1/00-from.in

@@ -1,3 +1,3 @@
 # Pull internal sles 15sp1 image.
 
-FROM dockerv2-gfx-build.gfx-assets.intel.com/upstream/sle15:15.1 AS xe-base-stage
+FROM amr-registry.caas.intel.com/vtt-osgc/os/sles:15.1 AS xe-base-stage