Update mandelboxes

philippemnoel · Apr 26, 2022 · 63dc005 · 63dc005
1 parent c84e1ee
commit 63dc005
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 166 deletions.
diff --git a/mandelboxes/base/Dockerfile.20 b/mandelboxes/base/Dockerfile.20
@@ -19,7 +19,7 @@ FROM whist/build-assets:$BuildAssetPackage as build-assets
 # - Configure and build libinput
 # EXPOSES .deb build of libinput for later stages
 #########################################################
-FROM ubuntu:20.04 as libinput-build
+FROM ubuntu:22.04 as libinput-build
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -93,7 +93,7 @@ RUN dpkg-deb --build libinput-whist
 # - Configure and build xf86-input-libinput
 # EXPOSES build of xf86-input-libinput
 ####################################################################
-FROM ubuntu:20.04 as xf86-input-libinput-build
+FROM ubuntu:22.04 as xf86-input-libinput-build
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -167,7 +167,7 @@ RUN dpkg-deb --build xf86-input-libinput-whist
 # - Install its contents into an output directory
 # EXPOSES the grid driver
 #############################################################
-FROM ubuntu:20.04 as nvidia-grid-driver
+FROM ubuntu:22.04 as nvidia-grid-driver
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -231,7 +231,7 @@ RUN mkdir /dist/etc && \
 #   events
 # EXPOSES the teleport fuse service
 ###################################################################
-FROM ubuntu:20.04 as whist-teleport-drag-drop
+FROM ubuntu:22.04 as whist-teleport-drag-drop
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -274,7 +274,7 @@ RUN cd /whist-teleport-drag-drop/src \
 #   only taking up one Docker layer in whist-base
 # EXPOSES the hydraulic-squash directory
 ###############################################################
-FROM ubuntu:20.04 as hydraulic-press
+FROM ubuntu:22.04 as hydraulic-press
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -428,7 +428,7 @@ COPY --chown=root:root --chmod=600 main/whist-main.service $HYDRAULIC_ROOT/etc/s
 #   our base mandelbox image
 # EXPOSES all of whist-base as the final image
 #############################################################
-FROM ubuntu:20.04 as whist-base
+FROM ubuntu:22.04 as whist-base
 
 # Force failure on non-zero exit code for commands with a pipe in them
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]

diff --git a/mandelboxes/base/build-assets/Dockerfile.20 b/mandelboxes/base/build-assets/Dockerfile.20
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as default
+FROM ubuntu:22.04 as default
 
 # This target bundles assets from other monorepo projects for
 # convenient importing in various Dockerfiles. It does not

diff --git a/mandelboxes/browsers/base-chromium/Dockerfile.20 b/mandelboxes/browsers/base-chromium/Dockerfile.20
@@ -6,7 +6,7 @@ FROM whist/build-assets:$BuildAssetPackage as build-assets
 # Whist Chromium Extension Build Stage
 #########################################################
 
-FROM ubuntu:20.04 as whist-teleport-chrome-extension
+FROM ubuntu:22.04 as whist-teleport-chrome-extension
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/mandelboxes/browsers/base-chromium/teleport-extension/package.json b/mandelboxes/browsers/base-chromium/teleport-extension/package.json
@@ -9,15 +9,15 @@
   "devDependencies": {
     "@types/chrome": "^0.0.181",
     "@types/simple-peer": "^9.6.1",
-    "copy-webpack-plugin": "^7.0.0",
+    "copy-webpack-plugin": "^10.0.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "path-browserify": "^1.0.1",
     "prettier": "^2.2.1",
     "process": "^0.11.10",
     "simple-peer": "^9.9.3",
     "tailwindcss": "^3.0.23",
-    "ts-loader": "^8.0.17",
+    "ts-loader": "^9.0.0",
     "typescript": "^4.1.5",
     "webpack": "^5.68.0",
     "webpack-cli": "^4.5.0",
@@ -30,13 +30,13 @@
     "format-check": "prettier --check . --ignore-path .gitignore"
   },
   "dependencies": {
-    "@types/react": "^17.0.40",
-    "@types/react-dom": "^17.0.13",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "@types/react-helmet": "^6.1.5",
     "autoprefixer": "^10.4.4",
     "postcss": "^8.4.12",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "react-helmet": "^6.1.0"
   }
 }