From e23ae1bcf0e18763cd46a21463b1668480503996 Mon Sep 17 00:00:00 2001
From: Mariusz Marciniak <mariusz.marciniak.pl@gmail.com>
Date: Tue, 1 Aug 2023 05:05:13 +0200
Subject: [PATCH 1/3] KASM-4608 Update core image

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39a5943..865af48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,8 @@ stages:
   - test
   - manifest
 variables:
-  BASE_TAG: "develop"
-  USE_PRIVATE_IMAGES: 0
+  BASE_TAG: "feature_KASM-4608_kasm_printing"
+  USE_PRIVATE_IMAGES: 1
   KASM_RELEASE: "1.14.0"
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   TEST_INSTALLER: "https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_backend/7cbc7854255820c60cfecb2dee5177c1663af43a/kasm_workspaces_feature_KASM-4513-slim-upgrades_1.14.0.7cbc78.tar.gz"

From c0d442fff9af1bc31a534ab4823db99a11565301 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Wed, 9 Aug 2023 15:30:58 -0400
Subject: [PATCH 2/3] KASM-4721 remove king-phisher to get tracelabs building
 and trigger a fresh build to ingest new core images

---
 src/ubuntu/install/tracelabs/install_tracelabs.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ubuntu/install/tracelabs/install_tracelabs.sh b/src/ubuntu/install/tracelabs/install_tracelabs.sh
index cdea4f4..2d73841 100644
--- a/src/ubuntu/install/tracelabs/install_tracelabs.sh
+++ b/src/ubuntu/install/tracelabs/install_tracelabs.sh
@@ -13,7 +13,6 @@ apt-get install -y \
   fern-wifi-cracker \
   guymager \
   hydra-gtk \
-  king-phisher \
   legion \
   ophcrack \
   ophcrack-cli \

From 81ce898a5a232624262ea3a2153747785d1838b8 Mon Sep 17 00:00:00 2001
From: Richard Koliser <richard.koliser@kasmweb.com>
Date: Wed, 9 Aug 2023 23:30:51 -0400
Subject: [PATCH 3/3] KASM-4608 Revert branch change

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 865af48..39a5943 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,8 @@ stages:
   - test
   - manifest
 variables:
-  BASE_TAG: "feature_KASM-4608_kasm_printing"
-  USE_PRIVATE_IMAGES: 1
+  BASE_TAG: "develop"
+  USE_PRIVATE_IMAGES: 0
   KASM_RELEASE: "1.14.0"
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   TEST_INSTALLER: "https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_backend/7cbc7854255820c60cfecb2dee5177c1663af43a/kasm_workspaces_feature_KASM-4513-slim-upgrades_1.14.0.7cbc78.tar.gz"