Adding the environment variables of vscode to home user. Updating to version 2.0.13

Dockerfile

@@ -12,6 +12,16 @@ RUN sudo apt-get install -y wget
 #Instalando jq
 RUN sudo apt-get install -y jq
 
+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 +44,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,54 +1,56 @@
 #!/bin/bash
-#if [[ -z "${HOME_USER}" ]]; then
-    #HOME_USER="vscode"
-#fi
+set -eu
 
-set -e
-
-# use specified user name or use `vscode` if not specified
-HOME_USER="${HOME_USER:-vscode}"
-
-# use specified group name or use the same user name also as the group name
-MY_GROUP="${MY_GROUP:-${HOME_USER}}"
-
-# use the specified UID for the user
-MY_UID="${MY_UID:-1000}"
-
-# use the specified GID for the user
-MY_GID="${MY_GID:-${MY_UID}}"
-
-
-# check to see if group exists; if not, create it
-if grep -q -E "^${MY_GROUP}:" /etc/group > /dev/null 2>&1
-then
-  echo "INFO: Group exists; skipping creation"
-else
-  echo "INFO: Group doesn't exist; creating..."
-  # create the group
-  sudo addgroup -g "${MY_GID}" "${MY_GROUP}" || (echo "INFO: Group exists but with a different name; renaming..."; sudo groupmod -g "${MY_GID}" -n "${MY_GROUP}" "$(awk -F ':' '{print $1":"$3}' < /etc/group | grep ":${MY_GID}$" | awk -F ":" '{print $1}')")
+if [[ -z "${HOME_USER}" ]]; then
+    HOME_USER="vscode"
 fi
 
-
-# check to see if user exists; if not, create it
-if id -u "${HOME_USER}" > /dev/null 2>&1
-then
-  echo "INFO: User exists; skipping creation"
-else
-  echo "INFO: User doesn't exist; creating..."
-  # create the user
-  sudo adduser -u "${MY_UID}" -G "${MY_GROUP}" -h "/home/${HOME_USER}" -s /bin/sh -D "${HOME_USER}"
-fi
-
-# addgroup nonroot
+#addgroup nonroot
 #adduser --disabled-password --gecos "" ${HOME_USER}
-# echo "${HOME_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+#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" != "$(whoami)" ]; 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 -u $HOME_USER -i
+    # Unfortunately we cannot change $HOME as we cannot move any bind mounts
+    # nor can we bind mount $HOME into a new home as that requires a privileged container.
+    # sudo usermod --login "$HOME_USER" vscode
+    # sudo groupmod -n "$HOME_USER" vscode
+
+    # sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
+    # sudo cd /home/${HOME_USER}
+    sudo chown -R ${HOME_USER}:${HOME_USER} /home/${HOME_USER}
+    # 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
+  fi
+fi
+
 
 #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

version.txt

@@ -1 +1 @@
-1.1.3
+2.0.13