[S] Change in coreboot[main]: util/docker/doc.coreboot.org: Get rid of bash workarounds

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85725?usp=email )

Change subject: util/docker/doc.coreboot.org: Get rid of bash workarounds
......................................................................

util/docker/doc.coreboot.org: Get rid of bash workarounds

It seems the .bashrc is not loaded as intended and thus the bash
mechanisms never worked. So drop the bash invocations and replace them
with the ash shell. Also, don't modify the PATH variable since this is
done by the activation script.

Change-Id: I544a15c86c212e91ece59b583fb61dad37fca337
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85725
Tested-by: build bot (Jenkins) 
Reviewed-by: Nicholas Chin 
---
M util/docker/doc.coreboot.org/Dockerfile
M util/docker/doc.coreboot.org/makeSphinx.sh
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nicholas Chin: Looks good to me, approved

diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile
index 0979daf..1864063 100644
--- a/util/docker/doc.coreboot.org/Dockerfile
+++ b/util/docker/doc.coreboot.org/Dockerfile
@@ -7,7 +7,6 @@
    	python3 \
    	py3-pip \
    	make \
-		bash \
    	git \
    	ttf-dejavu \
    	fontconfig \
@@ -21,11 +20,10 @@
 USER coreboot

ENV VIRTUAL_ENV="/home/coreboot/python3"
-ENV PATH=$VIRTUAL_ENV/bin:$PATH:/home/coreboot/.local/bin

RUN \
    python3 -m venv $VIRTUAL_ENV && \
-	echo "source ${VIRTUAL_ENV}/bin/activate"  >> /home/coreboot/.bashrc && \
+	source ${VIRTUAL_ENV}/bin/activate && \
    pip3 install --upgrade --no-cache-dir pip && \
    pip3 install --no-cache-dir \
    	jinja2==3.1.3 \
@@ -39,5 +37,5 @@
 # Port 35729 - websockets connection to allow automatic browser reloads after each build
 EXPOSE 8000 35729

-ENTRYPOINT ["/bin/bash", "/makeSphinx.sh"]
+ENTRYPOINT [ "/makeSphinx.sh" ]
 CMD []
diff --git a/util/docker/doc.coreboot.org/makeSphinx.sh b/util/docker/doc.coreboot.org/makeSphinx.sh
index 96a593c..577e487 100755
--- a/util/docker/doc.coreboot.org/makeSphinx.sh
+++ b/util/docker/doc.coreboot.org/makeSphinx.sh
@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ash
+
+source ${VIRTUAL_ENV}/bin/activate

if [ "$1" == "livehtml" ]; then
   echo "Starting live documentation build"