Skip to content

Commit eb76f08

Browse files
committed
Allow using dev images as root
Don't abort the entrypoint script if the user-id already exists. This allows using the dev images as root or when using Podman, which does some user mapping already. This should fix #76 Signed-off-by: Oliver Steffen <[email protected]>
1 parent a0dd931 commit eb76f08

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Fedora-35/fedora35_dev_entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
4040
groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
4141
#
4242
# - Add the user.
43-
useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
43+
useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
4444
-G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
4545

4646
echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

Fedora-37/fedora37_dev_entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
3939
groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
4040
#
4141
# - Add the user.
42-
useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
42+
useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
4343
-G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
4444

4545
echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

Ubuntu-20/ubuntu20_dev_entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
4343
groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
4444
#
4545
# - Add the user.
46-
useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
46+
useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
4747
-G sudo -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
4848

4949
echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

Ubuntu-22/ubuntu22_dev_entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
4242
groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
4343
#
4444
# - Add the user.
45-
useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
45+
useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
4646
-G sudo -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
4747

4848
echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

0 commit comments

Comments
 (0)