Fixing name of gitea package.

.github/workflows/main-workflow.yml

@@ -8,23 +8,43 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     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
+      # 🔑 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
+      # 🔑 Login to Gitea Registry
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v1
+        with:
+          registry: gitea.p-lao.com
+          username: aleleba
+          password: ${{ secrets.GITEA_API_TOKEN }}
+
+      # 🚀 Build and push to BOTH registries
+      - name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
-          tags: aleleba/vscode:latest
+          platforms: linux/amd64,linux/arm64
-          platforms: linux/amd64,linux/arm64
+          tags: |
+            aleleba/vscode:latest
+            gitea.p-lao.com/aleleba/vscode:latest
+
+      - name: Trigger workflow in Gitea
+        if: success()
+        run: |
+          curl -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_API_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            https://gitea.p-lao.com/api/v1/repos/aleleba/vscode-server/actions/workflows/main-workflow.yml/dispatches \
+            -d '{"ref":"master","inputs":{"image":"gitea.p-lao.com/aleleba/vscode-server:latest"}}'

entrypoint.sh

@@ -111,7 +111,12 @@ fi
 
 # Find .sh files in /usr/bin/custom-scripts and execute them in order
 for script in $(find /usr/bin/custom-scripts -name "*.sh" | sort); do
-  chmod +x $script
+  # Ensure the script is executable
+  if [ ! -x $script ]; then
+    sudo chmod +x $script
+  fi
+
+  # Execute the script as the configured user
   if [[ $script == *"sudo"* ]]; then
     sudo -u $HOME_USER bash -c "source /etc/environment; sudo $script"
   else
@@ -119,6 +124,7 @@ for script in $(find /usr/bin/custom-scripts -name "*.sh" | sort); do
   fi
 done
 
+
 #Creating extensions folder
 if [ ! -d "/home/${HOME_USER}/.config/Code" ]; then
   sudo mkdir -p /home/${HOME_USER}/.config/Code
@@ -146,7 +152,7 @@ if [ -f "/home/extensions.json" ]; then
     # Loop through the extensions and process each element
     for extension in $extensions; do
         echo "Installing extension: $extension"
-        sudo su ${HOME_USER} -c "code --install-extension $extension"
+        sudo su ${HOME_USER} -c "code --install-extension $extension --force"
     done
     sudo cp -R /home/${HOME_USER}/.vscode/* /home/${HOME_USER}/.vscode-server
     sudo cp -R /home/${HOME_USER}/.vscode/* /home/${HOME_USER}/.vscode-server-insiders
@@ -157,30 +163,8 @@ else
     echo "File extensions.json not found"
 fi
 
-# Check if CLI directory exists and has content
+if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
-if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then
+    sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}"
-    # CLI directory exists and has content, ensure proper permissions first
-    sudo chmod -R a+rwX /home/${HOME_USER}/.vscode/cli
-    
-    # Wait briefly to ensure services are up
-    sleep 2
-    
-    echo "Restarting VS Code tunnel..."
-    # Try to restart, but fall back to normal startup if it fails
-    if ! sudo su ${HOME_USER} -c "code tunnel restart"; then
-        echo "Tunnel restart failed, trying 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
 else
-    # No CLI directory or empty, use normal startup
+    sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms"
-    echo "Starting new VS Code tunnel session..."
-    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,15 +39,6 @@ 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:

version.txt

@@ -1 +1 @@
-3.2.1
+3.2.17