diff options
| author | Matthew Kobayashi <1856537+MattKobayashi@users.noreply.github.com> | 2024-05-11 04:15:36 +1000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-10 18:16:14 +0000 |
| commit | f1ef143ea4bbf118dc496eeb71abb5db1cf94c6b (patch) | |
| tree | 95bc1b283f3b1519b53dce2db63398962b15885d /docker/entrypoint.sh | |
| parent | 42fe1f06e79c69f04d80f988ca331badcd954cb0 (diff) | |
| download | vyos-documentation-f1ef143ea4bbf118dc496eeb71abb5db1cf94c6b.tar.gz vyos-documentation-f1ef143ea4bbf118dc496eeb71abb5db1cf94c6b.zip | |
docker: multiple updates
* Update Debian base image to 12
* Add --break-system-packages option to pip3 install command
* Remove chmod a+s from Dockerfile (newer versions of gosu in particular don't support this)
* Add sudo to relevant commands in entrypoint.sh
* Add UID_MIN key to adduser command (allows the container to run on MacOS)
* Formatting and spelling fixes
(cherry picked from commit 48fc4291536607036f3191cad21ff0065d1eeaaf)
Diffstat (limited to 'docker/entrypoint.sh')
| -rwxr-xr-x | docker/entrypoint.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 8db41103..c44f5047 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -23,10 +23,10 @@ if ! grep -q $NEW_GID /etc/group; then groupadd --gid $NEW_GID $USER_NAME fi -useradd --shell /bin/bash --uid $NEW_UID --gid $NEW_GID --non-unique --create-home $USER_NAME +useradd --shell /bin/bash --uid $NEW_UID --gid $NEW_GID --non-unique --create-home $USER_NAME --key UID_MIN=500 usermod --append --groups sudo $USER_NAME -sudo chown $NEW_UID:$NEW_GID /home/$USER_NAME +chown $NEW_UID:$NEW_GID /home/$USER_NAME export HOME=/home/$USER_NAME # Execute process -exec /usr/sbin/gosu $USER_NAME "$@" +/usr/sbin/gosu $USER_NAME "$@" |