Compare commits

..

3 Commits
1.1.2 ... 1.1.5

2 changed files with 18 additions and 41 deletions

View File

@ -3,48 +3,25 @@
# HOME_USER="vscode"
#fi
set -e
set -eu
# use specified user name or use `vscode` if not specified
HOME_USER="${HOME_USER:-vscode}"
# 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)"
# use specified group name or use the same user name also as the group name
MY_GROUP="${MY_GROUP:-${HOME_USER}}"
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 "$HOME_USER" vscode
sudo groupmod -n "$HOME_USER" vscode
# 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
addgroup -g "${MY_GID}" "${MY_GROUP}" || (echo "INFO: Group exists but with a different name; renaming..."; groupmod -g "${MY_GID}" -n "${MY_GROUP}" "$(awk -F ':' '{print $1":"$3}' < /etc/group | grep ":${MY_GID}$" | awk -F ":" '{print $1}')")
sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
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
adduser -u "${MY_UID}" -G "${MY_GROUP}" -h "/home/${HOME_USER}" -s /bin/sh -D "${HOME_USER}"
fi
# make the directories needed to run my app
mkdir -p /opt/myapp
# change ownership of any directories needed to run my app as the proper UID/GID
chown -R "${HOME_USER}:${MY_GROUP}" "/opt/myapp"
#addgroup nonroot
#adduser --disabled-password --gecos "" ${HOME_USER}
#echo "${HOME_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

View File

@ -1 +1 @@
1.1.2
1.1.5