Merge pull request #4587 from felder/felder_jammy_2

upgrading data100, eecs, stat159 to jammy
berkeley-dsep-infra · May 18, 2023 · 7044731 · 7044731
2 parents 991db76 + d1574c2
commit 7044731
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git 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
@@ -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
+zip
diff --git 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
@@ -1,4 +1,4 @@
-# For desktop environment
+# For desktop environment 
 dbus-x11
 xfce4
 xfce4-panel
@@ -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

diff --git 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
@@ -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