From c7a876a2c0a4af03d1692b52ba24938e2b873b05 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Thu, 18 May 2023 16:17:57 -0700
Subject: [PATCH 1/2] upgrading data100, eecs, stat159 to jammy

---
 deployments/data100/hubploy.yaml  | 6 +++++-
 deployments/data100/image/apt.txt | 3 +--
 deployments/eecs/hubploy.yaml     | 6 +++++-
 deployments/eecs/image/apt.txt    | 2 +-
 deployments/stat159/hubploy.yaml  | 6 +++++-
 deployments/stat159/image/apt.txt | 1 -
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/deployments/data100/hubploy.yaml b/deployments/data100/hubploy.yaml
index 976b4bef9..10cb00c1f 100644
--- a/deployments/data100/hubploy.yaml
+++ b/deployments/data100/hubploy.yaml
@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:
diff --git a/deployments/data100/image/apt.txt b/deployments/data100/image/apt.txt
index 8edfcc4b2..c4bb4d06c 100644
--- a/deployments/data100/image/apt.txt
+++ b/deployments/data100/image/apt.txt
@@ -16,7 +16,6 @@ wget
 vim
 emacs-nox
 emacs-goodies-el
-python-mode
 
 # A couple of CLI editors that are easier than vim
 # micro  # currently not working on 18.04
@@ -91,4 +90,4 @@ qgit
 meld
 
 # For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979			
-zip
\ No newline at end of file
+zip
diff --git a/deployments/eecs/hubploy.yaml b/deployments/eecs/hubploy.yaml
index 0598b87ba..a646be5b9 100644
--- a/deployments/eecs/hubploy.yaml
+++ b/deployments/eecs/hubploy.yaml
@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:
diff --git a/deployments/eecs/image/apt.txt b/deployments/eecs/image/apt.txt
index 999bf003e..0e0eabe31 100644
--- a/deployments/eecs/image/apt.txt
+++ b/deployments/eecs/image/apt.txt
@@ -1,4 +1,4 @@
-# For desktop environment
+# For desktop environment 
 dbus-x11
 xfce4
 xfce4-panel
diff --git a/deployments/stat159/hubploy.yaml b/deployments/stat159/hubploy.yaml
index 796b9c212..26fc63fcb 100644
--- a/deployments/stat159/hubploy.yaml
+++ b/deployments/stat159/hubploy.yaml
@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat159-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat159-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:
diff --git a/deployments/stat159/image/apt.txt b/deployments/stat159/image/apt.txt
index 9ec49ca0b..1b51ebd50 100644
--- a/deployments/stat159/image/apt.txt
+++ b/deployments/stat159/image/apt.txt
@@ -17,7 +17,6 @@ zip
 vim
 emacs-nox
 emacs-goodies-el
-python-mode
 
 # A couple of CLI editors that are easier than vim
 # micro  # currently not working on 18.04

From d1574c2c03283168e1e7f588592535d7d1c51a74 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Thu, 18 May 2023 16:44:30 -0700
Subject: [PATCH 2/2] replacing qt5-default (not available in jammy) with other
 packages that provide similar files

https://stackoverflow.com/questions/74110674/problem-installing-qt5-default-on-ubuntu-22-04
---
 deployments/eecs/image/apt.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployments/eecs/image/apt.txt b/deployments/eecs/image/apt.txt
index 0e0eabe31..0f29f01a1 100644
--- a/deployments/eecs/image/apt.txt
+++ b/deployments/eecs/image/apt.txt
@@ -16,7 +16,9 @@ xfce4-terminal
 default-jdk
 # Qt for pyqt based exercises in our desktop environment
 # https://github.com/berkeley-dsep-infra/datahub/issues/1505
-qt5-default
+# Does not exist in Jammy # qt5-default 
+qtbase5-dev
+qt5-qmake
 
 # https://github.com/berkeley-dsep-infra/datahub/issues/2535
 emacs