Fixing typo.

.github/workflows/main-workflow.yml

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

entrypoint.sh

@@ -157,8 +157,47 @@ else
     echo "File extensions.json not found"
 fi
 
+# 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,6 +179,9 @@ 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.

version.txt

@@ -1 +1 @@
-3.1.12
+3.2.5