Fix log handling in bash (#74)

* Fix logging to console

* Replace `username`  with `user`

* Fix how log handling in bash

* Fix directory errors

* Tail command needs to run in the background

* Remove log directory

* Fix brave errors

* Run child bash scripts in the back

* Fix echo

* Fix brave example

Author: wanjohiryan

docker/base/Dockerfile

@@ -75,15 +75,9 @@ RUN apt-get update; \
     #
     #make directories for warp
     #
-    mkdir -p /etc/warp /certs/ /media/ /usr/bin/warp /etc/warp/entrypoint.d/;\
-    chmod 1777 /certs/; \
-    chmod 1777 /media/; \
-    chmod 1777 /usr/bin/warp; \
-    chmod 1777 /etc/warp/entrypoint.d/; \
-    chown ${USERNAME} /certs/; \
-    chown ${USERNAME} /usr/bin/warp/; \
-    chown ${USERNAME} /etc/warp/entrypoint.d/; \
-    chown ${USERNAME} /media/; \
+    mkdir -p /etc/warp /certs /media /usr/bin/warp /etc/warp/entrypoint.d;\
+    chmod 1777 /certs /media /usr/bin/warp /etc/warp/entrypoint.d; \
+    chown ${USERNAME} /certs /usr/bin/warp /etc/warp/entrypoint.d /media; \
     chown -R $USERNAME:$USERNAME /home/${USERNAME}
 
 #
@@ -107,9 +101,6 @@ ENTRYPOINT [ "/usr/bin/tini","--" ]
 COPY docker/base/entrypoint.sh /etc/warp/entrypoint.sh
 RUN chmod +x /etc/warp/entrypoint.sh
 
-COPY docker/base/run-bash.sh /etc/warp/run-bash.sh
-RUN chmod +x /etc/warp/run-bash.sh
-
 COPY docker/base/generate-certs.sh /certs/generate-certs.sh
 RUN chmod +x /certs/generate-certs.sh
 

docker/base/entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -xeo pipefail
 
-trap 'trap " " SIGINT; kill -SIGINT 0; wait;' SIGINT SIGTERM
+trap '[[ -n $(jobs -p) ]] && kill $(jobs -p); echo "Error: Warp failed with exit code $?" >&2; [[ -n $(jobs -p) ]] && wait $(jobs -p); exit $?' ERR
 
 #Start dbus for pulseaudio
 sudo /etc/init.d/dbus start
@@ -21,19 +21,37 @@ pacmd set-default-sink vsink
 pacmd set-default-source vsink.monitor
 
 #Start ffmpeg
-source /etc/warp/ffmpeg.sh &
+source /etc/warp/ffmpeg.sh 2>&1 | awk '{ print "ffmpeg: " $0 }' &
 sleep 1 #ensure this has started before moving on
 
 #Generate selfsigned certs for warp
-source /certs/generate-certs.sh
+source /certs/generate-certs.sh 2>&1 | awk '{ print "generate-certs: " $0 }'
 
 set -e
 #Start warp server
 /usr/bin/warp/warp &
+sleep 1 #ensure this has started before moving on
 
 set -e
 #run child image entrypoint
-source /etc/warp/run-bash.sh
+echo "Running child scripts..."
+# Set the directory where the other bash files are located
+OTHER_SCRIPTS_DIR="/etc/warp/entrypoint.d"
+
+# Check if the directory exists
+if [ -d "$OTHER_SCRIPTS_DIR" ]; then
+  # Loop through all the files in the directory
+  for script_file in $OTHER_SCRIPTS_DIR/*.sh; do
+    # Check if the file is a bash script and is executable
+    if [ -x "$script_file" ] && [ "${script_file: -3}" == ".sh" ]; then
+      # Run the script
+      echo "Running script $script_file"
+      bash "$script_file"
+    fi
+  done
+else
+  echo "Directory $OTHER_SCRIPTS_DIR not found " 
+fi
 
 wait -n
 

docker/base/run-bash.sh

@@ -11,7 +11,7 @@ FROM $WARP_IMAGE
 # Add Brave Browser repository and key
 RUN wget -qO - https://brave-browser-apt-release.s3.brave.com/brave-core.asc | sudo apt-key add - ;\
     echo "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" | sudo tee /etc/apt/sources.list.d/brave-browser-release.list; \
-    sudo apt-get update && sudo apt-get install -y brave-browser; \
+    sudo apt-get update && sudo apt-get install -y brave-browser  dbus; \
     #
     # clean up
     #

docker/brave/Dockerfile

@@ -7,7 +7,8 @@ SCREEN_HEIGHT=1080
 
 #Create brave user directory
 USER_DATA_DIR="/home/$USER/.config/brave-browser"
-sudo mkdir -p "$USER_DATA_DIR"
+mkdir -p "$USER_DATA_DIR"
+sudo service dbus start
 
 # Start Brave browser and play kygo
 brave-browser \

docker/brave/brave.sh

@@ -168,14 +168,8 @@ RUN apt-get update; \
     #make directories for warp
     #
     mkdir -p /etc/warp /certs /media /usr/bin/warp /etc/warp/entrypoint.d;\
-    chmod 1777 /certs; \
-    chmod 1777 /media; \
-    chmod 1777 /usr/bin/warp; \
-    chmod 1777 /etc/warp/entrypoint.d; \
-    chown ${USERNAME} /certs; \
-    chown ${USERNAME} /usr/bin/warp; \
-    chown ${USERNAME} /etc/warp/entrypoint.d; \
-    chown ${USERNAME} /media; \
+    chmod 1777 /certs /media /usr/bin/warp /etc/warp/entrypoint.d; \
+    chown ${USERNAME} /certs /usr/bin/warp /etc/warp/entrypoint.d /media; \
     chown -R $USERNAME:$USERNAME /home/${USERNAME} ;\
     ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
 
@@ -193,9 +187,6 @@ ENTRYPOINT [ "/usr/bin/tini","--" ]
 COPY docker/nvidia/entrypoint.sh /etc/warp/entrypoint.sh
 RUN chmod +x /etc/warp/entrypoint.sh
 
-COPY docker/nvidia/run-bash.sh /etc/warp/run-bash.sh
-RUN chmod +x /etc/warp/run-bash.sh
-
 COPY docker/nvidia/generate-certs.sh /certs/generate-certs.sh
 RUN chmod +x /certs/generate-certs.sh
 

docker/nvidia/Dockerfile

@@ -6,7 +6,6 @@
 trap '[[ -n $(jobs -p) ]] && kill $(jobs -p); echo "Error: Warp failed with exit code $?" >&2; [[ -n $(jobs -p) ]] && wait $(jobs -p); exit $?' ERR
 
 # Modify permissions of XDG_RUNTIME_DIR
-
 sudo -u $USER mkdir -pm700 /tmp/runtime-user
 sudo chown $USER:$USER /tmp/runtime-user
 sudo chmod 700 /tmp/runtime-user
@@ -27,6 +26,7 @@ export PATH="${PATH}:/usr/games:/opt/VirtualGL/bin"
 export LD_LIBRARY_PATH="/usr/local/cuda/lib64:${LD_LIBRARY_PATH}"
 
 # Run Xvfb server with required extensions
+echo "Starting Xvfb..."
 Xvfb "${DISPLAY}" -ac -screen "0" "8192x4096x24" -dpi "96" +extension "RANDR" +extension "GLX" +iglx +extension "MIT-SHM" +render -nolisten "tcp" -noreset -shmem &
 sleep 0.5
 
@@ -42,19 +42,36 @@ pacmd set-default-sink vsink
 pacmd set-default-source vsink.monitor
 
 #Start ffmpeg
-source /etc/warp/ffmpeg.sh &
+source /etc/warp/ffmpeg.sh 2>&1 | awk '{ print "ffmpeg: " $0 }' &
 sleep 1 #ensure this has started before moving on
 
 #Generate selfsigned certs for warp
-source /certs/generate-certs.sh
+source /certs/generate-certs.sh 2>&1 | awk '{ print "generate-certs: " $0 }'
 
 set -e
 #Start warp server
 /usr/bin/warp/warp &
+sleep 1 #ensure this has started before moving on
 
 set -e
 #run child image entrypoint
-source /etc/warp/run-bash.sh
+echo "Running child scripts..."
+# Set the directory where the other bash files are located
+OTHER_SCRIPTS_DIR="/etc/warp/entrypoint.d"
+
+# Check if the directory exists
+if [ -d "$OTHER_SCRIPTS_DIR" ]; then
+  # Loop through all the files in the directory
+  for script_file in $OTHER_SCRIPTS_DIR/*.sh; do
+    # Check if the file is a bash script and is executable
+    if [ -x "$script_file" ] && [ "${script_file: -3}" == ".sh" ]; then
+      # Run the script
+      bash "$script_file"
+    fi
+  done
+else
+  echo "Directory $OTHER_SCRIPTS_DIR not found " 
+fi
 
 wait -n