Updated to lates xe-solutions

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

Dockerfile

@@ -15,7 +15,7 @@
 # Template from templates/ubuntu/00-FROM.in
 #
 # Pull from ubuntu on Docker Hub
-FROM ubuntu:disco AS base
+FROM ubuntu:disco AS graphics-base
 
 
 #
@@ -85,7 +85,7 @@ 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
 #
-FROM base AS pre-user
+FROM base AS graphics-base
 
 # Once we have a signed repository:
 #
@@ -123,11 +123,12 @@ RUN echo "deb [trusted=yes arch=amd64] https://repositories.intel.com/graphics/u
 # Create user 'graphics' and add them to 'sudo' for sudo access and set
 # the passwd to 'graphics'
 
-FROM graphics AS user-stage
+FROM graphics-base AS user-stage
 
 RUN apt-get -q update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-    sudo \
+  && DEBIAN_FRONTEND=noninteractive \
+    apt-get install --no-install-recommends -y \
+      sudo \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
 

templates/ubuntu/00-FROM.in

@@ -1,3 +1,3 @@
 # Pull from $OS_DISTRO on Docker Hub
-FROM $OS_DISTRO:$OS_RELEASE AS base
+FROM $OS_DISTRO:$OS_RELEASE AS graphics-base
 

templates/ubuntu/20-repositories-intel-com.in

@@ -1,4 +1,4 @@
-FROM base AS pre-user
+FROM base AS graphics-base
 
 # Once we have a signed repository:
 #

templates/ubuntu/25-graphics-user.in

@@ -1,11 +1,12 @@
 # Create user 'graphics' and add them to 'sudo' for sudo access and set
 # the passwd to 'graphics'
 
-FROM graphics AS user-stage
+FROM graphics-base AS user-stage
 
 RUN apt-get -q update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-    sudo \
+  && DEBIAN_FRONTEND=noninteractive \
+    apt-get install --no-install-recommends -y \
+      sudo \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}