From dcaa519dbc4bf9d588ed3b311dfb4fb0d81e9981 Mon Sep 17 00:00:00 2001
From: Justin Barksdale <justin@spectrocloud.com>
Date: Fri, 21 Apr 2023 10:52:10 +0000
Subject: [PATCH] Dockerfile

---
 images/Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/images/Dockerfile b/images/Dockerfile
index 3a3dcdb..cf0e062 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -29,22 +29,26 @@ RUN mkdir -p /etc/luet/repos.conf.d && \
 RUN luet install -y  k8s/k3s@$K8S_VERSION && luet cleanup
 RUN luet install -y system/elemental-cli && luet cleanup
 
+
+# ENV OS_NAME=$OS_ID:${SPECTRO_VERSION}
+# ENV OS_REPO=${IMAGE_REPOSITORY}
+# ENV OS_LABEL=${BASE_IMAGE_TAG}_${K8S_VERSION}_${SPECTRO_VERSION}
+# RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
+
 ENV OS_ID=ubuntu
 ENV OS_VERSION=22.04
-# ENV OS_ID=${BASE_IMAGE_NAME}-k3s
-ENV OS_NAME=$OS_ID:${SPECTRO_VERSION}
+ENV OS_NAME=${BASE_IMAGE_NAME}-k3s:${SPECTRO_VERSION}
 ENV OS_REPO=${IMAGE_REPOSITORY}
-# ENV OS_VERSION=${K8S_VERSION}_${SPECTRO_VERSION}
 ENV OS_LABEL=${BASE_IMAGE_TAG}_${K8S_VERSION}_${SPECTRO_VERSION}
 RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
-   
+
 RUN apt-get update && apt-get install zstd -y
    
     
 ## Copy any custom files by placing in the directory specified below
 COPY overlay/files/ /
    
-RUN apt-get update -y
+RUN apt-get update && apt-get upgrade -y
 RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && \
             ln -sf "${kernel#/boot/}" /boot/vmlinuz
 RUN kernel=$(ls /lib/modules | head -n1) && \