Trying to fix existing tunnel.

.github/workflows/main-workflow.yml

@@ -0,0 +1,30 @@
+name: Build and Push Docker Image ARM64
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: aleleba/vscode:latest
+          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,8 +1,7 @@
 FROM ubuntu:22.04
 
 # Update the package list, install sudo, create a non-root user, and grant password-less sudo permissions
-RUN apt update
-RUN apt install -y sudo
+RUN apt update && apt install -y sudo
 
 RUN sudo apt-get update
 #Instalando Curl
@@ -13,10 +12,10 @@ RUN sudo apt-get install -y wget
 RUN sudo apt-get install -y jq
 
 RUN sudo apt-get update
-RUN sudo apt-get install dumb-init
+RUN sudo apt-get install -y dumb-init
 
 RUN ARCH="$(dpkg --print-architecture)" \
-  && curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - \
+  && curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-${ARCH}.tar.gz" | tar -C /usr/local/bin -xzf - \
   && chown root:root /usr/local/bin/fixuid \
   && chmod 4755 /usr/local/bin/fixuid \
   && mkdir -p /etc/fixuid \
@@ -29,14 +28,16 @@ RUN ARCH="$(dpkg --print-architecture)" \
 RUN curl -sL https://aka.ms/DevTunnelCliInstall | bash
 
 #Instalando VSCode
-RUN sudo apt-get update && sudo apt-get install -y gnupg2
-RUN sudo apt-get install -y software-properties-common
-RUN sudo wget -q https://packages.microsoft.com/keys/microsoft.asc -O- | sudo apt-key add -
-RUN sudo add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
-RUN sudo apt update
-RUN sudo apt install code -y
+RUN ARCH="$(dpkg --print-architecture)" \
+    && sudo apt-get update \
+    && sudo apt-get install -y gnupg2 \
+    && sudo apt-get install -y software-properties-common \
+    && sudo wget -q https://packages.microsoft.com/keys/microsoft.asc -O- | sudo apt-key add - \
+    && sudo add-apt-repository "deb [arch=${ARCH}] https://packages.microsoft.com/repos/vscode stable main" \
+    && sudo apt-get update \
+    && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y code
 
-#Making home writteable
+#Making home writable
 RUN sudo chmod -R a+rwX /home
 
 RUN sudo sysctl -w fs.inotify.max_user_watches=524288

entrypoint.sh

@@ -77,7 +77,20 @@ if [ "$HOME_USER" != "$(whoami)" ]; then
   exec sudo -u $HOME_USER bash -c "source /etc/environment; /usr/bin/entrypoint.sh"
 else
   sudo chown -R ${HOME_USER} /home/${HOME_USER}
-  sudo chmod -R 600 /home/${HOME_USER}/.ssh
+  if [ -d "/home/${HOME_USER}/.ssh" ]; then
+    sudo chmod 755 /home/${HOME_USER}/.ssh
+    sudo chmod -R 600 /home/${HOME_USER}/.ssh/*
+    # Check if any .pub files exist in the .ssh directory
+    for file in /home/${HOME_USER}/.ssh/*.pub; do
+      if [ -f "$file" ]; then
+        sudo chmod 644 "$file"
+      fi
+    done
+    # Check if the known_hosts file exists in the .ssh directory
+    if [ -f "/home/${HOME_USER}/.ssh/known_hosts" ]; then
+      sudo chmod 644 /home/${HOME_USER}/.ssh/known_hosts
+    fi
+  fi
 fi
 
 # Move the .bashrc file to the user's home directory if it doesn't exist
@@ -144,8 +157,47 @@ else
     echo "File extensions.json not found"
 fi
 
-if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
-    sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}"
+# Check if CLI directory exists and has content
+if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then
+    # CLI directory exists and has content, extract token and tunnel information
+    
+    # Extract token from token.json if it exists
+    TOKEN_FILE="/home/${HOME_USER}/.vscode/cli/token.json"
+    if [ -f "$TOKEN_FILE" ]; then
+        TOKEN=$(cat "$TOKEN_FILE" | tr -d '\n')
+    else
+        TOKEN=""
+    fi
+    
+    # Extract id and cluster from code_tunnel.json if it exists
+    TUNNEL_FILE="/home/${HOME_USER}/.vscode/cli/code_tunnel.json"
+    if [ -f "$TUNNEL_FILE" ]; then
+        if command -v jq &> /dev/null; then
+            # Use jq if available
+            ID=$(jq -r '.id' "$TUNNEL_FILE")
+            CLUSTER=$(jq -r '.cluster' "$TUNNEL_FILE")
+        else
+            # Fallback to grep and cut if jq is not available
+            ID=$(grep -o '"id"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
+            CLUSTER=$(grep -o '"cluster"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
+        fi
+        TUNNEL_ID="${ID}.${CLUSTER}"
+    else
+        TUNNEL_ID=""
+    fi
+    
+    # Create tunnel with extracted values if available
+    if [ -n "$TOKEN" ] && [ -n "$TUNNEL_ID" ]; then
+        sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME} --tunnel-id ${TUNNEL_ID}--host-token ${TOKEN}"
+    else
+        # Fallback to simpler command if values couldn't be extracted
+        sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME}"
+    fi
 else
+    # No CLI directory or empty, use normal startup
+    if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
+        sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}"
+    else
         sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms"
+    fi
 fi

readme.md

@@ -39,6 +39,15 @@ docker run -it -e HOME_USER=custom-home-user -e GLOBAL_ENV_MY_GLOBAL_VARIABLE=my
 ```
 In this example, MY_GLOBAL_VARIABLE will be set to my_global_value in the /etc/environment file.
 
+### Persistent VS Code Tunnel
+
+You can maintain the VS Code tunnel configuration between container restarts by adding a volume mount to `/home/${HOME_USER}/.vscode/cli`. When this volume is mounted and the container restarts, it will use `code tunnel restart` to reconnect using the existing tunnel configuration instead of creating a new one.
+
+Example:
+```bash
+docker run -it -e HOME_USER=custom-home-user -e VSCODE_TUNNEL_NAME=vscode-ssh-remote-server -v /path/to/vscode-cli:/home/custom-home-user/.vscode/cli -v /path/to/extensions.json:/home/extensions.json aleleba/vscode
+```
+
 ### Adding VSCode Extensions
 
 To add VSCode extensions to the container, create a JSON file with an array of objects containing the extension details you want to install, the only Mandatory field is uniqueIdentifier and follow this structure. For example:
@@ -170,8 +179,13 @@ RUN echo 'source ~/.nvm/nvm.sh' >> ~/.bashrc
 # Finishing installing node.js and NVM
 
 ```
+
+
+
 > **Note:** If you are using this image as a base image in a Dockerfile, ensure that the value of `HOME_USER` is the same as the one you will use when creating the container. This is necessary to ensure that all configurations and packages are installed in the correct user directory.
 
+> **Note:** To grant access to the server, please log into https://github.com/login/device and use the code XXXX-XXXX. You can view the container logs to get the code.
+
 ## Contributing
 
 If you'd like to contribute to this project, please fork the repository and create a pull request.

version.txt

@@ -1 +1 @@
-3.0.36
+3.2.4