From 78362f7da7b24f928562ab3a3c628adcf3ac7ca0 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jacksond@decidr.ai>
Date: Mon, 23 Dec 2024 14:46:37 +1100
Subject: [PATCH] nvm-nvidia-ssh-port

---
 docker/Dockerfile       | 46 +++++++++++++++++++++++------------------
 docker/scripts/start.sh |  2 +-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c67d439..b741c84 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:25.04
+FROM ubuntu:24.04
 
 ARG DESKTOP_ENVIRONMENT_GITHUB_USER
 ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
@@ -79,6 +79,7 @@ RUN apt-get update -qq && \
   jq \
   keychain \
   ksnip \
+  libappindicator3-dev \
   libnotify-bin \
   libnss3-tools \
   libssl-dev \
@@ -103,6 +104,7 @@ RUN apt-get update -qq && \
   pciutils \
   pcmanfm \
   perl \
+  pipewire \
   pipx \
   pkg-config \
   pulseaudio \
@@ -361,21 +363,25 @@ RUN curl -fsSL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz |
 RUN git clone --depth 1 https://github.com/cloud-computer/noVNC.git /opt/noVNC && \
   git clone --depth 1 https://github.com/novnc/websockify /opt/noVNC/utils/websockify
 
+# Install nvidia driver
+# RUN apt-get update -qq && \
+#   apt-get install linux-headers-$(uname -r) && \
+#   wget -qnv -O nvidia-driver.run https://us.download.nvidia.com/XFree86/Linux-x86_64/565.77/NVIDIA-Linux-x86_64-565.77.run && \
+#   chmod +x nvidia-driver.run && \
+#   ./nvidia-driver.run --allow-installation-with-running-driver --silent && \
+#   rm nviia-driver.run
+
 # Install nvidia driver
 RUN apt-get update -qq && \
   apt-get install -qq \
-  nvidia-cuda-toolkit && \
-  wget -qnv -O nvidia-driver.run https://us.download.nvidia.com/XFree86/Linux-x86_64/565.77/NVIDIA-Linux-x86_64-565.77.run && \
-  chmod +x nvidia-driver.run && \
-  ./nvidia-driver.run --silent && \
-  rm nviia-driver.run
+  nvidia-cuda-toolkit
 
 # Install nvm
 RUN mkdir /opt/nvm && \
   curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | \
   NVM_DIR=/opt/nvm bash && \
   . /opt/nvm/nvm.sh && \
-  nvm install 18
+  nvm install 20
 
 # Install obsidian
 RUN wget -qnv -O obsidian.deb https://github.com/obsidianmd/obsidian-releases/releases/download/v1.7.7/obsidian_1.7.7_amd64.deb && \
@@ -410,21 +416,21 @@ RUN pipx install posting
 RUN pipx install pywal
 
 # Install screenpipe
-RUN apt-get update -qq && \
-  apt-get install -qq libasound2-dev libavdevice-dev libavfilter-dev libavformat-dev libclang-16-dev libtesseract-dev tesseract-ocr libxdo-dev libxtst-dev && \
-  git clone --depth 1 https://github.com/mediar-ai/screenpipe /opt/screenpipe && \
-  cd /opt/screenpipe && \
-  cargo build --release && \
-  install target/release/screenpipe /usr/local/bin
+# RUN apt-get update -qq && \
+#   apt-get install -qq libasound2-dev libavdevice-dev libavfilter-dev libavformat-dev libclang-16-dev libtesseract-dev tesseract-ocr libxdo-dev libxtst-dev && \
+#   git clone --depth 1 https://github.com/mediar-ai/screenpipe /opt/screenpipe && \
+#   cd /opt/screenpipe && \
+#   cargo build --release && \
+#   install target/release/screenpipe /usr/local/bin
 
 # Install screenpipe ui
-RUN apt-get update -qq && \
-  apt-get install -qq libappindicator3-dev && \
-  cd /opt/screenpipe/screenpipe-app-tauri && \
-  npm install bun && \
-  npx bun install && \
-  npx bun scripts/pre_build.js >/dev/null && \
-  PATH=$HOME/.cargo/bin:$PATH npx bun tauri build || true
+# RUN apt-get update -qq && \
+#   apt-get install -qq libappindicator3-dev && \
+#   cd /opt/screenpipe/screenpipe-app-tauri && \
+#   npm install bun && \
+#   npx bun install && \
+#   npx bun scripts/pre_build.js >/dev/null && \
+#   PATH=$HOME/.cargo/bin:$PATH npx bun tauri build || true
 
 # Install shell chatgpt
 RUN pipx install shell-gpt
diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh
index e8cc1a8..272d5db 100755
--- a/docker/scripts/start.sh
+++ b/docker/scripts/start.sh
@@ -35,10 +35,10 @@ docker run \
   --interactive \
   --name $DESKTOP_ENVIRONMENT_CONTAINER_NAME \
   --network $DESKTOP_ENVIRONMENT_DOCKER_NETWORK \
-  --publish 8022:22 \
   --publish 8080:8080 \
   --publish 8081:8081 \
   --publish 8082:8082 \
+  --publish 8822:22 \
   --rm \
   --security-opt apparmor:unconfined \
   --volume /dev/displaylink:/dev/displaylink \