From 41033fae9a44bd22367304a7cf47a19cdb947929 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:19:25 +0100
Subject: debian: T5003: Fix docker entrypoint

---
 docker/Dockerfile    | 4 +++-
 docker/entrypoint.sh | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d13ac7cc..c222c651 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -574,7 +574,8 @@ RUN gem install --no-document fpm
 
 # Allow password-less 'sudo' for all users in group 'sudo'
 RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
-    chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/usermod
+    echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
+    chmod a+s /usr/sbin/useradd /usr/sbin/groupadd
 
 # Ensure sure all users have access to our OCAM and Go installation
 RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \
@@ -587,4 +588,5 @@ RUN rm -rf /tmp/*
 RUN echo -e "set mouse=\nset ttymouse=" > /etc/vim/vimrc.local
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 8db41103..adc7264c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -24,9 +24,11 @@ if ! grep -q $NEW_GID /etc/group; then
 fi
 
 useradd --shell /bin/bash --uid $NEW_UID --gid $NEW_GID --non-unique --create-home $USER_NAME
-usermod --append --groups sudo $USER_NAME
-sudo chown $NEW_UID:$NEW_GID /home/$USER_NAME
 export HOME=/home/$USER_NAME
 
+if [ "$(id -u)" == "0" ]; then
+    exec gosu $USER_NAME "$@"
+fi
+
 # Execute process
-exec /usr/sbin/gosu $USER_NAME "$@"
+exec "$@"
-- 
cgit v1.2.3


From 213418f181aba3866249d853c381696ea960b157 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:47:31 +0100
Subject: debian: T5003: Fix FRR build using old version of Sphinx

---
 docker/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c222c651..2ba2125f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -257,9 +257,6 @@ RUN export LIBYANG_COMMIT="v2.0.164" && \
     cd libyang && git checkout $LIBYANG_COMMIT && apkg build -i && \
     cd pkg/pkgs/debian-*/libyang2_* && dpkg -i *.deb
 
-# FRR documentation also has a dependency on an up to date spinx version
-RUN pip install sphinx==4.0.2
-
 # Packages needed to build FRR itself
 # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
 # for more info
@@ -286,6 +283,7 @@ RUN apt-get update && apt-get install -y \
       python3 \
       python3-dev \
       python3-pytest \
+      python3-sphinx \
       texinfo
 
 # Packages needed for hvinfo
-- 
cgit v1.2.3