From ce92462041b9e1ac8ce6cacadbaf49ddbbbfaea4 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 16 Apr 2018 16:26:08 -0400 Subject: [PATCH] fix uid comparisons --- src/Admin/entrypoint.sh | 5 ++--- src/Api/entrypoint.sh | 5 ++--- src/Icons/entrypoint.sh | 5 ++--- src/Identity/entrypoint.sh | 5 ++--- util/Attachments/entrypoint.sh | 5 ++--- util/MsSql/entrypoint.sh | 5 ++--- util/Nginx/entrypoint.sh | 5 ++--- util/Setup/entrypoint.sh | 5 ++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/Admin/entrypoint.sh b/src/Admin/entrypoint.sh index daece81b20..6de40e49bb 100644 --- a/src/Admin/entrypoint.sh +++ b/src/Admin/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/src/Api/entrypoint.sh b/src/Api/entrypoint.sh index 575145aea3..44a6d26eb3 100644 --- a/src/Api/entrypoint.sh +++ b/src/Api/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/src/Icons/entrypoint.sh b/src/Icons/entrypoint.sh index db819ba726..4ad8541614 100644 --- a/src/Icons/entrypoint.sh +++ b/src/Icons/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/src/Identity/entrypoint.sh b/src/Identity/entrypoint.sh index f11095ad5a..2deac55178 100644 --- a/src/Identity/entrypoint.sh +++ b/src/Identity/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/util/Attachments/entrypoint.sh b/util/Attachments/entrypoint.sh index 8ba950614b..6e6347c4ec 100644 --- a/util/Attachments/entrypoint.sh +++ b/util/Attachments/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/util/MsSql/entrypoint.sh b/util/MsSql/entrypoint.sh index 4482493e12..c54e8637ba 100644 --- a/util/MsSql/entrypoint.sh +++ b/util/MsSql/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/util/Nginx/entrypoint.sh b/util/Nginx/entrypoint.sh index 2083da2e96..b79973b7cf 100644 --- a/util/Nginx/entrypoint.sh +++ b/util/Nginx/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ] diff --git a/util/Setup/entrypoint.sh b/util/Setup/entrypoint.sh index 852366ceb1..5e3f205865 100644 --- a/util/Setup/entrypoint.sh +++ b/util/Setup/entrypoint.sh @@ -8,8 +8,7 @@ USERNAME="bitwarden" CURRENTGID=`getent group $GROUPNAME | cut -d: -f3` LGID=${LOCAL_GID:-999} -CURRENTUID=`id -u $USERNAME` -NOUSER=`$CURRENTUID > /dev/null 2>&1; echo $?` +NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?` LUID=${LOCAL_UID:-999} # Step down from host root @@ -38,7 +37,7 @@ fi # Create user and assign group -if [ $NOUSER == 0 ] && [ "$CURRENTUID" != "$LUID" ] +if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ] then usermod -u $LUID $USERNAME elif [ $NOUSER == 1 ]