From cc152c39c959538e503b21e068407d217b05ceaf Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Sun, 27 Nov 2022 20:52:03 -0500
Subject: [PATCH 1/2] Update docker logic and point branch to upgrade feature

---
 Dockerfile         | 7 +++++--
 Dockerfile.aarch64 | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a279b9f..7248622 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,8 @@ ENV DOCKER_TLS_CERTDIR=""
 ENV TINI_SUBREAPER=true
 
 #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
+ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \
+    VERSION="develop"
 
 # Container setup
 RUN \
@@ -63,9 +64,10 @@ RUN \
   if [ -z ${KASM_VERSION+x} ]; then \
       KASM_VERSION=$(curl -sX GET https://kasm-ci.s3.amazonaws.com/dev-version.txt); \
   fi && \
+  echo "${KASM_VERSION}" > /version.txt && \
   curl -o \
     /tmp/wizard.tar.gz -L \
-    "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \
+    "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-2903-upgrade-support" && \
   tar xf \
     /tmp/wizard.tar.gz -C \
     /wizard --strip-components=1 && \
@@ -78,6 +80,7 @@ RUN \
   tar xf \
     /tmp/kasm.tar.gz -C \
     / && \
+  sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \
   echo "**** copy assets ****" && \
   cp \
     /kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 49c4fed..a9fc21a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -12,7 +12,8 @@ ENV DOCKER_TLS_CERTDIR=""
 ENV TINI_SUBREAPER=true
 
 #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility"
+ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \
+    VERSION="develop"
 
 # Container setup
 RUN \
@@ -63,9 +64,10 @@ RUN \
   if [ -z ${KASM_VERSION+x} ]; then \
       KASM_VERSION=$(curl -sX GET https://kasm-ci.s3.amazonaws.com/dev-version.txt); \
   fi && \
+  echo "${KASM_VERSION}" > /version.txt && \
   curl -o \
     /tmp/wizard.tar.gz -L \
-    "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \
+    "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-2903-upgrade-support" && \
   tar xf \
     /tmp/wizard.tar.gz -C \
     /wizard --strip-components=1 && \
@@ -78,6 +80,7 @@ RUN \
   tar xf \
     /tmp/kasm.tar.gz -C \
     / && \
+  sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \ 
   echo "**** copy assets ****" && \
   cp \
     /kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \

From 9ebd2e1ef59a233ffba6c5ccf46935089a2e344b Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Wed, 30 Nov 2022 15:22:23 -0800
Subject: [PATCH 2/2] revert manual pinning for PR into develop

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7248622..0bbf840 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,7 @@ RUN \
   echo "${KASM_VERSION}" > /version.txt && \
   curl -o \
     /tmp/wizard.tar.gz -L \
-    "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-2903-upgrade-support" && \
+    "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \
   tar xf \
     /tmp/wizard.tar.gz -C \
     /wizard --strip-components=1 && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a9fc21a..e990e33 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -67,7 +67,7 @@ RUN \
   echo "${KASM_VERSION}" > /version.txt && \
   curl -o \
     /tmp/wizard.tar.gz -L \
-    "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-2903-upgrade-support" && \
+    "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \
   tar xf \
     /tmp/wizard.tar.gz -C \
     /wizard --strip-components=1 && \