docker: align intel-gfx docker for ubuntu 22.04 with latest dgpu-docs

This commit aligns intel-gfx ubuntu 22.04 docker with latest
instruction at https://dgpu-docs.intel.com/driver/installation.html

We add 'rolling stable' repository as to be used by default. Users
can adjust the repo to use with the following docker build arguments:

  --build-arg INTEL_GFX_DISTRIBUTION=jammy/production/2328
  --build-arg INTEL_GFX_FLAVOR=unified

Signed-off-by: Dmitry Rogozhkin <[email protected]>

.github/workflows/main.yml

@@ -31,13 +31,6 @@ jobs:
     # but let's have ci step which prints them out for easier look up
     - run: rst-lint --level info . || true
 
-  cdn-intel-pkgs-u20-04:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Building CDN demo w/ Intel pkgs
-      run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/intel-gfx/Dockerfile -t intel-media-delivery-cdn .
-
   cdn-intel-pkgs-u22-04:
     runs-on: ubuntu-latest
     steps:

doc/howto.rst

@@ -274,14 +274,14 @@ Pass these arguments as ``docker --build-arg ARGUMENT=VALUE``.
 INTEL_GFX_KEY_URL
   Possible values: ``<web-link>``.
 
-  Default value: ``https://repositories.intel.com/graphics/intel-graphics.key``
+  Default value: ``https://repositories.intel.com/gpu/intel-graphics.key``
 
   Web download link to fetch Intel APT repo key from.
 
 INTEL_GFX_APT_REPO
   Possible values: ``<debian-apt-config-line>``.
 
-  Default value: ``deb https://repositories.intel.com/graphics/ubuntu focal main``
+  Default value: ``deb https://repositories.intel.com/gpu/ubuntu jammy unified``
 
   Intel APT repository to fetch graphics packages from. See `Local APT Repositor <apt.rst>`_
   setup example.

docker/ubuntu22.04/intel-gfx/Dockerfile

@@ -30,9 +30,10 @@ RUN apt-get update && \
     curl ca-certificates gpg-agent software-properties-common && \
   rm -rf /var/lib/apt/lists/*
 
-ARG INTEL_GFX_KEY_URL="https://repositories.intel.com/graphics/intel-graphics.key"
-ARG INTEL_GFX_FLAVOR=flex
-ARG INTEL_GFX_APT_REPO="deb https://repositories.intel.com/graphics/ubuntu jammy $INTEL_GFX_FLAVOR"
+ARG INTEL_GFX_KEY_URL="https://repositories.intel.com/gpu/intel-graphics.key"
+ARG INTEL_GFX_DISTRIBUTION=jammy
+ARG INTEL_GFX_FLAVOR=unified
+ARG INTEL_GFX_APT_REPO="deb https://repositories.intel.com/gpu/ubuntu $INTEL_GFX_DISTRIBUTION $INTEL_GFX_FLAVOR"
 
 RUN \
   if [ -n "$INTEL_GFX_KEY_URL" ]; then \

docker/ubuntu22.04/intel-gfx/Dockerfile.m4

@@ -21,7 +21,6 @@
 include(defs.m4)dnl
 divert(-1)
 define(`USE_VPL_TOOLS',yes)
-define(`INTEL_GFX_FLAVOR_NAME',flex)
 divert(0)dnl
 include(begin.m4)
 include(intel-gfx.m4)

templates/m4docker/components/intel-gfx.m4

@@ -32,16 +32,16 @@ include(begin.m4)
 
 include(ubuntu.m4)
 
-define(`INTEL_GFX_URL',https://repositories.intel.com/graphics)
-DECLARE(`INTEL_GFX_FLAVOR_NAME',main)
+define(`INTEL_GFX_URL',https://repositories.intel.com/gpu)
+DECLARE(`INTEL_GFX_FLAVOR_NAME',unified)
 
 pushdef(`_install_ubuntu',`dnl
-pushdef(`_tmp',`ifelse($1,`',UBUNTU_CODENAME(OS_VERSION),UBUNTU_CODENAME(OS_VERSION)-$1)')dnl
 INSTALL_PKGS(PKGS(curl ca-certificates gpg-agent software-properties-common))
 
 ARG INTEL_GFX_KEY_URL="INTEL_GFX_URL/intel-graphics.key"
+ARG INTEL_GFX_DISTRIBUTION=UBUNTU_CODENAME(OS_VERSION)
 ARG INTEL_GFX_FLAVOR=INTEL_GFX_FLAVOR_NAME
-ARG INTEL_GFX_APT_REPO="deb INTEL_GFX_URL/ubuntu _tmp $INTEL_GFX_FLAVOR"
+ARG INTEL_GFX_APT_REPO="deb INTEL_GFX_URL/ubuntu $INTEL_GFX_DISTRIBUTION $INTEL_GFX_FLAVOR"
 
 RUN \
   if [ -n "$INTEL_GFX_KEY_URL" ]; then \
@@ -53,7 +53,7 @@ RUN \
     echo "$INTEL_GFX_APT_REPO" >> /etc/apt/sources.list; \
   fi && \
   apt-get update
-popdef(`_tmp')')
+')
 
 ifelse(OS_NAME:OS_VERSION,ubuntu:20.04,`define(`ENABLE_INTEL_GFX_REPO',defn(`_install_ubuntu'))')
 ifelse(OS_NAME:OS_VERSION,ubuntu:22.04,`define(`ENABLE_INTEL_GFX_REPO',defn(`_install_ubuntu'))')