diff --git a/Dockerfile b/Dockerfile index 5cef204..6678e84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ 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 adduser --uid 1001 --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 - \ @@ -22,10 +22,6 @@ RUN ARCH="$(dpkg --print-architecture)" \ && mkdir -p /etc/fixuid \ && printf "user: vscode\ngroup: vscode\n" > /etc/fixuid/config.yml -USER 1000 -ENV USER=vscode -WORKDIR /home/vscode - #Instalando devtunnel #Comandos que no se deben olvidar correr al crear el devtunnel #devtunnel user login -g -d @@ -48,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"] \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 6076438..a09c284 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -13,14 +13,14 @@ fi # Otherwise the current container UID may not exist in the passwd database. eval "$(fixuid -q)" -if [ "${DOCKER_USER-}" ]; then - USER="$DOCKER_USER" - if [ "$DOCKER_USER" != "$(whoami)" ]; then - echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null +if [ "${HOME_USER-}" ]; then + USER="$HOME_USER" + if [ "$HOME_USER" != "$(whoami)" ]; then + 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 "$DOCKER_USER" vscode - sudo groupmod -n "$DOCKER_USER" vscode + sudo usermod --login "$HOME_USER" vscode + sudo groupmod -n "$HOME_USER" vscode sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd fi diff --git a/version.txt b/version.txt index 10bf840..f93ea0c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.1 \ No newline at end of file +2.0.2 \ No newline at end of file