Trying to fix issue. Updating to version 1.1.6

entrypoint.sh

@@ -1,47 +1,30 @@
 #!/bin/bash
-#if [[ -z "${HOME_USER}" ]]; then
+if [[ -z "${HOME_USER}" ]]; then
-    #HOME_USER="vscode"
+    HOME_USER="vscode"
-#fi
-
-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}')")
 fi
 
+set -eu
 
-# check to see if user exists; if not, create it
+# We do this first to ensure sudo works below when renaming the user.
-if id -u "${HOME_USER}" > /dev/null 2>&1
+# Otherwise the current container UID may not exist in the passwd database.
-then
+eval "$(fixuid -q)"
-  echo "INFO: User exists; skipping creation"
+
-else
+if [ "${HOME_USER-}" ]; then
-  echo "INFO: User doesn't exist; creating..."
+  USER="$HOME_USER"
-  # create the user
+  if [ "$HOME_USER" != "$(whoami)" ]; then
-  sudo adduser -u "${MY_UID}" -G "${MY_GROUP}" -h "/home/${HOME_USER}" -s /bin/sh -D "${HOME_USER}"
+    echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
+    # 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" $HOME_USER
+    sudo groupmod -n "$HOME_USER" $HOME_USER
+
+    sudo sed -i "/$HOME_USER/d" /etc/sudoers.d/nopasswd
+  fi
 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
 
 #Creating extensions folder
 sudo mkdir /home/${HOME_USER}/.config/Code

version.txt

@@ -1 +1 @@
-1.1.3
+1.1.6