Trying to fix issue of running entrypont.sh as root. Updating to version 2.0.57

Dockerfile

@@ -12,6 +12,19 @@ RUN sudo apt-get install -y wget
 #Instalando jq
 RUN sudo apt-get install -y jq
 
+RUN sudo apt-get update
+RUN sudo apt-get install dumb-init
+
+RUN adduser --gecos '' --disabled-password vscode \
+    && echo "vscode ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
+
+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 - \
+  && chown root:root /usr/local/bin/fixuid \
+  && chmod 4755 /usr/local/bin/fixuid \
+  && mkdir -p /etc/fixuid \
+  && printf "user: vscode\ngroup: vscode\n" > /etc/fixuid/config.yml
+
 #Instalando devtunnel
 #Comandos que no se deben olvidar correr al crear el devtunnel
 #devtunnel user login -g -d
@@ -34,4 +47,8 @@ RUN sudo sysctl -w fs.inotify.max_user_watches=524288
 ADD ./entrypoint.sh /usr/bin/entrypoint.sh
 RUN sudo chmod +x /usr/bin/entrypoint.sh
 
+USER 1000
+ENV USER=vscode
+WORKDIR /home/vscode
+
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]

entrypoint.sh

@@ -1,18 +1,96 @@
 #!/bin/bash
-if [[ -z "${HOME_USER}" ]]; then
+set -eu
+
+# Check if we are root
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root" 1>&2
+   exec sudo /usr/bin/entrypoint.sh
+fi
+
+if [[ -z "${HOME_USER-}" ]]; then
     HOME_USER="vscode"
 fi
 
-addgroup nonroot
-adduser --disabled-password --gecos "" ${HOME_USER}
-echo "${HOME_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+# We do this first to ensure sudo works below when renaming the user.
+# Otherwise the current container UID may not exist in the passwd database.
+eval "$(fixuid -q)"
+
+if [ "${HOME_USER-}" ]; then
+  USER="$HOME_USER"
+  if [[ "${HOME_USER-}" != "vscode" ]]; then
+    if ! id -u $HOME_USER > /dev/null 2>&1; then
+      sudo adduser --disabled-password --gecos "" ${HOME_USER}
+      sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
+    fi
+
+    sudo cp -R /home/vscode/. /home/${HOME_USER}/
+
+    # Check if .bashrc file exists
+    if [ ! -f "/home/${HOME_USER}/.bashrc" ]; then
+        # If not, create it
+        sudo touch /home/${HOME_USER}/.bashrc
+    fi
+
+    # Change the owner of the .bashrc file to HOME_USER
+    sudo chown ${HOME_USER} /home/${HOME_USER}/.bashrc
+
+    # Copy environment variables from vscode user to HOME_USER
+    env | grep -v 'HOME_USER' | while read -r line; do
+      sudo su - ${HOME_USER} -c "echo 'export $line' >> ~/.bashrc"
+    done
+
+    # Copy the .bashrc file from vscode user to HOME_USER
+    sudo su - ${HOME_USER} -c "cat /home/vscode/.bashrc >> ~/.bashrc"
+
+    # Creating .vscode folder if it doesn't exist
+    if [ ! -d "/home/${HOME_USER}/.vscode" ]; then
+      sudo mkdir -p /home/${HOME_USER}/.vscode
+    fi
+
+    # Changing the property of the directory /home/${HOME_USER}/.vscode
+    sudo chown -R ${HOME_USER}: /home/${HOME_USER}/.vscode
+    
+    # Changing the HOME_USER in the .bashrc file
+    sudo su - ${HOME_USER} -c "sudo sed -i \"s|/home/vscode|/home/${HOME_USER}|g\" ~/.bashrc"
+
+    # Switch to the user specified by $HOME_USER and start an interactive shell session.
+    sudo su -l ${HOME_USER}
+
+    # Copy the HOME variable from vscode user to HOME_USER
+    sudo su -l ${HOME_USER} -c "echo \"export HOME=/home/${HOME_USER}\" >> ~/.bashrc"
+
+    # Source the .bashrc file to apply the changes immediately
+    sudo su -l ${HOME_USER} -c "source ~/.bashrc"
+
+    # Delete the vscode user
+    if id "vscode" &>/dev/null; then
+      sudo chown -R vscode:vscode /home/vscode
+      sudo userdel -r vscode
+    fi
+  else
+    # Switch to the user specified by $HOME_USER and start an interactive shell session.
+    sudo su -l ${HOME_USER}
+  fi
+fi
+
+# Add LS_COLORS variable to .bashrc
+LS_COLORS_VALUE="rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:"
+sudo su - ${HOME_USER} -c "echo 'export LS_COLORS=\"$LS_COLORS_VALUE\"' >> ~/.bashrc"
 
 #Creating extensions folder
-sudo mkdir /home/${HOME_USER}/.config/Code
+if [ ! -d "/home/${HOME_USER}/.config/Code" ]; then
+  sudo mkdir -p /home/${HOME_USER}/.config/Code
+fi
 sudo chmod -R a+rwX /home/${HOME_USER}/.config/Code
-sudo mkdir /home/${HOME_USER}/.vscode-server
+
+if [ ! -d "/home/${HOME_USER}/.vscode-server" ]; then
+  sudo mkdir -p /home/${HOME_USER}/.vscode-server
+fi
 sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server
-sudo mkdir /home/${HOME_USER}/.vscode-server-insiders
+
+if [ ! -d "/home/${HOME_USER}/.vscode-server-insiders" ]; then
+  sudo mkdir -p /home/${HOME_USER}/.vscode-server-insiders
+fi
 sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server-insiders
 
 # Check if the data.json file exists
@@ -20,8 +98,8 @@ if [ -f "/home/extensions.json" ]; then
     # Read the JSON file into a variable
     jsonExtensions=$(cat /home/extensions.json)
 
-    # Use jq to extract the array elements
-    extensions=$(echo $jsonExtensions | jq -r '.[]')
+    # Use jq to extract the extension parameter from the JSON array
+    extensions=$(echo $jsonExtensions | jq -r '.[].extensionsGroup.extensions[].uniqueIdentifier')
 
     # Loop through the extensions and process each element
     for extension in $extensions; do
@@ -29,7 +107,7 @@ if [ -f "/home/extensions.json" ]; then
         sudo su - ${HOME_USER} -c "code --install-extension $extension"
     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
+    sudo cp -R /home/${HOME_USER}/.vscode/* /home/${HOME_USER}/.vscode-server-insiders
     sudo chmod -R a+rwX /home/${HOME_USER}/.vscode
     sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server
     sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server-insiders

readme.md

@@ -0,0 +1,110 @@
+# Aleleba VSCode Dockerfile Configuration
+
+This repository contains a Dockerfile configuration for use with Visual Studio Code with dev tunnel.
+
+## Getting Started
+
+To run the Docker container, follow these steps:
+
+1. Clone this repository to your local machine.
+2. Open the integrated terminal in Visual Studio Code.
+3. Run the Docker container by running the following command: `docker run -it -e HOME_USER=custom-home-user -e VSCODE_TUNNEL_NAME=vscode-ssh-remote-server -v /path/to/extensions.json:/home/extensions.json aleleba/vscode`
+
+### Environment Variables
+
+The following environment variables can be set when running the Docker container:
+
+- `HOME_USER`: The username of the user running the container. This is used to set the correct permissions on files created in the container.
+- `VSCODE_TUNNEL_NAME`: The name of the SSH tunnel used by Visual Studio Code to connect to the container.
+
+### 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:
+```
+[
+    {
+        "extensionsGroup": {
+            "description": "Extensions of Spanish Language Pack",
+            "extensions": [
+                {
+                    "name": "Spanish Language Pack for Visual Studio Code",
+                    "notes": "Extension of Spanish Language Pack for Visual Studio Code",
+                    "uniqueIdentifier": "ms-ceintl.vscode-language-pack-es"
+                }
+            ]
+        }
+    },
+    {
+        "extensionsGroup": {
+            "description": "Extensions of Github Copilot",
+            "extensions": [
+                {
+                    "name": "GitHub Copilot",
+                    "notes": "Extension of GitHub Copilot",
+                    "uniqueIdentifier": "github.copilot"
+                },
+                {
+                    "name": "GitHub Copilot Chat",
+                    "notes": "Extension of GitHub Copilot Chat",
+                    "uniqueIdentifier": "github.copilot-chat"
+                }
+            ]
+        }
+    }
+]
+```
+
+Save this file as `extensions.json` and add it as a volume when running the Docker container on /home/extensions.json. For example:
+`docker run -it -e HOME_USER=custom-home-user -e VSCODE_TUNNEL_NAME=vscode-ssh-remote-server -v /path/to/extensions.json:/home/extensions.json aleleba/vscode`
+
+
+The extensions will be installed automatically after the container is created.
+
+### Using Docker Compose
+
+Alternatively, you can use Docker Compose to run the container with the `aleleba/vscode` image and the `HOME_USER` and `VSCODE_TUNNEL_NAME` environment variables set. Here's an example `docker-compose.yml` file:
+
+```
+version: '3'
+
+services:
+  vscode:
+    image: aleleba/vscode
+    environment:
+      HOME_USER: custom-home-user
+      VSCODE_TUNNEL_NAME: vscode-ssh-remote-server
+    volumes:
+      - /path/to/extensions.json:/home/extensions.json
+```
+
+You can run this `docker-compose.yml` file by navigating to the directory where it is saved and running the following command: `docker-compose up -d`
+
+This will start the container in the background and output the container ID. You can then use the `docker ps` command to view the running container.
+
+## Using this image as a base image in a Dockerfile
+
+To use this image as a base image in a Dockerfile, you can add the following line to the top of your Dockerfile and you can install any additional packages you need, here an example installing nvm and nodejs in a `Dockerfile`:
+
+```
+FROM aleleba/vscode:latest
+
+# Installing node.js and NVM
+SHELL ["/bin/bash", "--login", "-i", "-c"]
+RUN curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
+RUN nvm install --lts
+RUN nvm alias default lts/*
+SHELL ["/bin/sh", "-c"]
+RUN echo 'source ~/.nvm/nvm.sh' >> ~/.bashrc
+# Finishing installing node.js and NVM
+
+```
+
+## Contributing
+
+If you'd like to contribute to this project, please fork the repository and create a pull request.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+I hope this helps! Let me know if you have any further questions.

version.txt

@@ -1 +1 @@
-1.0.23
+2.0.57