From 4ce032c5301ded615453eaa348f6204e13621ea4 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james.p.ketrenos@intel.com>
Date: Wed, 13 Nov 2019 13:40:48 -0800
Subject: [PATCH] Updated to lates xe-solutions

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
---
 Dockerfile                                    | 11 ++++++-----
 templates/ubuntu/00-FROM.in                   |  2 +-
 templates/ubuntu/20-repositories-intel-com.in |  2 +-
 templates/ubuntu/25-graphics-user.in          |  7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e24f91f..8e7ef97 100644
--- a/Dockerfile
+++ b/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}
 
diff --git a/templates/ubuntu/00-FROM.in b/templates/ubuntu/00-FROM.in
index a32ec6b..c061193 100644
--- a/templates/ubuntu/00-FROM.in
+++ b/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
 
diff --git a/templates/ubuntu/20-repositories-intel-com.in b/templates/ubuntu/20-repositories-intel-com.in
index d802dd6..d64b695 100644
--- a/templates/ubuntu/20-repositories-intel-com.in
+++ b/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:
 #
diff --git a/templates/ubuntu/25-graphics-user.in b/templates/ubuntu/25-graphics-user.in
index 4229143..a63a8a8 100644
--- a/templates/ubuntu/25-graphics-user.in
+++ b/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}