re-enable VNC server and clean up entry point

Author: jpeel-impinj

Dockerfile.devel

@@ -36,30 +36,27 @@ ADD ./bash_completion /home/$USERNAME/.bash_completion
 RUN mkdir -p /home/$USERNAME/.bash_completion.d
 
 
+# Adjust $USERNAME home directory permissions
+USER root
+RUN chown -R $USERNAME:$USERNAME /home/$USERNAME
+
 # Switch to 'user' context
 USER $USERNAME
 
 # Configure environment variables
-# ENV DISPLAY=:0
+ENV DISPLAY=:0
 ENV ZEPHYR_BASE=/workdir/zephyr
 
 # Set working directory
 WORKDIR /workdir
 VOLUME ["/workdir"]
 
 # Configure VNC authentication
-# ARG VNCPASSWD=zephyr
-# RUN mkdir ~/.vnc && x11vnc -storepasswd ${VNCPASSWD} ~/.vnc/passwd
+ARG VNCPASSWD=zephyr
+RUN mkdir ~/.vnc && x11vnc -storepasswd ${VNCPASSWD} ~/.vnc/passwd
 
 # Expose port 5900 for VNC
-# EXPOSE 5900
-
-# Adjust $USERNAME home directory permissions
-USER root
-RUN chown -R $USERNAME:$USERNAME /home/$USERNAME
-
-# Make 'user' default on launch
-USER $USERNAME
+EXPOSE 5900
 
 # Launch bash shell by default
 CMD ["/bin/bash"]

entrypoint.sh

@@ -1,28 +1,9 @@
-#!/bin/dash
+#!/bin/bash
 
-# SNUM=$(echo $DISPLAY | sed 's/:\([0-9][0-9]*\)/\1/')
-# xvfb-run -n $SNUM -s "-screen 0 1024x768x24" -f ~/.Xauthority openbox-session &
-# sleep 1
-# x11vnc -display $DISPLAY -usepw -forever -quiet &
+SNUM=$(echo $DISPLAY | sed 's/:\([0-9][0-9]*\)/\1/')
+xvfb-run -n $SNUM -s "-screen 0 1024x768x24" -f ~/.Xauthority openbox-session &
+sleep 1
+x11vnc -display $DISPLAY -usepw -forever -quiet &
 
-sudo chown $(id -u) /workdir
-sudo chgrp $(id -g) /workdir
-
-# this assumes the usb dongle of interest is located on bus 0 and device 3
-# if not this should me modified to match (or can be run manually once the
-# container is started)
-if [ -c "/dev/bus/usb/001/003" ]; then
-    echo "USB device detected at bus 001, device 003 Changing permissions"
-    sudo chmod 0666 /dev/bus/usb/001/003
-fi
-
-# check to see if the STM32 Cube programmer is installed, and if it is
-# then append it to the PATH
-# can be downloaded from
-# https://www.st.com/en/development-tools/stm32cubeprog.html
-if [ -d "/home/$USER/st/stm32cubeclt_1.17.0/STM32CubeProgrammer" ]; then
-    echo "Adding the STM32 Cube Programmer to the path"
-    export PATH=$PATH:/home/$USER/st/stm32cubeclt_1.17.0/STM32CubeProgrammer/bin
-fi
 
 exec "$@"