Skip to content

Commit 00ff4ca

Browse files
committed
Packages: use groupadd/useradd on Debian-based operating systems.
addgroup/adduser will no longer be installed by default in the "minbase". Also, moving to lower-level utilities saves us one runtime dependency.
1 parent d56ff07 commit 00ff4ca

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

pkg/deb/debian/unit.postinst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ BANNER
2525
fi
2626

2727
if ! getent group unit >/dev/null; then
28-
addgroup --system unit >/dev/null
28+
groupadd --system unit >/dev/null
2929
fi
3030

3131
if ! getent passwd unit >/dev/null; then
32-
adduser \
32+
useradd \
3333
--system \
34-
--disabled-login \
35-
--ingroup unit \
34+
--gid unit \
3635
--no-create-home \
3736
--home /nonexistent \
38-
--gecos "unit user" \
37+
--comment "unit user" \
3938
--shell /bin/false \
4039
unit >/dev/null
4140
fi

pkg/docker/template.Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,13 @@ RUN set -ex \
5454
&& @@RUN@@ \
5555
&& mkdir -p /var/lib/unit/ \
5656
&& mkdir /docker-entrypoint.d/ \
57-
&& addgroup --system unit \
58-
&& adduser \
57+
&& groupadd --system unit \
58+
&& useradd \
5959
--system \
60-
--disabled-login \
61-
--ingroup unit \
60+
--gid unit \
6261
--no-create-home \
6362
--home /nonexistent \
64-
--gecos "unit user" \
63+
--comment "unit user" \
6564
--shell /bin/false \
6665
unit \
6766
&& apt-get update \

0 commit comments

Comments
 (0)