Dockerfile

@@ -3,34 +3,42 @@ FROM ubuntu
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends\
-# Some basic helpers \
         bash \
         sudo \
         git \
-        ca-certificates \
+        procps
-        procps \
+
-\
+RUN mkdir -p /opt/noVNC
-# X11 and XFCE \
+
+RUN adduser --home /home/novnc --shell /bin/bash --system --disabled-password novnc \
+    && echo "novnc ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# X11 and xfce
+RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends\
         xvfb xauth dbus-x11 xfce4 xfce4-terminal \
-        x11-xserver-utils \
+        x11-xserver-utils
-\
+
-# VNC \
+# VNC
+RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends\
-        python3 python3-numpy \
+        python3 python3-pip \
         tigervnc-standalone-server tigervnc-common \
         openssl \
-\
+    && pip3 install numpy
-# NoVNC \
+
-    && mkdir -p /opt/noVNC \
+# NoVNC
-    && git clone --single-branch https://github.com/novnc/noVNC.git /opt/noVNC \
+RUN git clone --single-branch https://github.com/novnc/noVNC.git /opt/noVNC \
     && git clone --single-branch https://github.com/novnc/websockify.git /opt/noVNC/utils/websockify \
-    && ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html \
+    && ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html
-    && openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem \
+
-    \
+RUN openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem
-# Audio requirements \
+
+
+# Audio
+RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends\
         pulseaudio \
@@ -40,14 +48,13 @@ RUN apt-get update \
         gstreamer1.0-pulseaudio \
         gstreamer1.0-tools
 
-
 COPY pulse/ /etc/pulse
 COPY novnc /opt/noVNC/
 RUN sed -i "/import RFB/a \
         import '../webaudio.js'" \
     /opt/noVNC/app/ui.js
 
-# Base applications
+# Extra applications
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends\
@@ -57,3 +64,6 @@ COPY entrypoint.sh /opt/noVNC/entrypoint.sh
 
 ENTRYPOINT ["/opt/noVNC/entrypoint.sh"]
 EXPOSE 8080
+
+USER novnc
+WORKDIR /home/novnc

README.md

@@ -1,23 +1,13 @@
 # NOVNC-BASE
 
-A desktop environment with sound in docker.
+A desktop environment with sound in docker
 
 Can be used as a base file for application specific containers.
 
-- `thomasloven/novnc-ubuntu`
-- `thomasloven/novnc-debuan`
-- `thomasloven/novnc-alpine`
-
-To just get a desktop environment at `http://localhost:8080`:
-
-```bash
-docker run --rm -p 8080:8080 thomasloven/novnc-ubuntu
-```
-
-Or used as a base for specific applications:
 
+E.g:
 ```dockerfile
-FROM thomasloven/novnc-ubuntu
+FROM thomasloven/novnc-base
 
 RUN sudo apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
@@ -26,12 +16,6 @@ RUN sudo apt-get update \
 CMD ["blender"]
 ```
 
-See more examples in `apps/`.
-
-
-The container will run as user `$USERNAME` (default `novnc`) with uid `${UUID}` (default `1000`) and group id `${GUID}` (default `1000`).
-The user has sudo privileges with no password(!).
-
 ### Bonus functionality - dotfiles installation.
 If the environment variable `DOTFILES_REPO` is set, the container will `git
 clone` that into `~/dotfiles` and then run `~/dotfiles/install.sh` if it

alpine.Dockerfile

@@ -1,61 +0,0 @@
-FROM alpine
-
-RUN apk update \
-    && apk add \
-# Some basic helpers \
-        bash \
-        sudo \
-        git \
-        procps \
-\
-# X11 and XFCE \
-    && apk add \
-        xvfb xauth dbus-x11 xfce4 xfce4-terminal \
-\
-# VNC \
-    && apk add \
-        python3 py3-numpy \
-        tigervnc \
-        openssl \
-\
-# NoVNC \
-    && mkdir -p /opt/noVNC \
-    && git clone --single-branch https://github.com/novnc/noVNC.git /opt/noVNC \
-    && git clone --single-branch https://github.com/novnc/websockify.git /opt/noVNC/utils/websockify \
-    && ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html \
-    && openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem \
-# Audio requirements \
-    && apk add \
-        pulseaudio \
-        pavucontrol \
-        ucspi-tcp6 \
-        gstreamer \
-        gstreamer-tools \
-        gst-plugins-good \
-        xfce4-pulseaudio-plugin
-
-COPY pulse/ /etc/pulse
-COPY novnc /opt/noVNC/
-RUN sed -i "/import RFB/a \
-        import '../webaudio.js'" \
-    /opt/noVNC/app/ui.js
-
-# Base applications
-RUN apk update \
-    && apk add \
-        firefox-esr neovim
-
-COPY entrypoint.sh /opt/noVNC/entrypoint.sh
-
-ENTRYPOINT ["/opt/noVNC/entrypoint.sh"]
-EXPOSE 8080
-
-# Add a custom version of vncserver which discards all arguments but the display
-RUN mv /usr/bin/vncserver /usr/bin/vncserver-orig \
-  && echo -e "#!/bin/bash \n \
-  /usr/bin/vncserver-orig \$1" > /usr/bin/vncserver \
-  && chmod +x /usr/bin/vncserver
-
-RUN mkdir -p /etc/skel/.vnc/ \
-  && echo -e "-Securitytypes=none" > /etc/skel/.vnc/config \
-  && touch /etc/skel/.vnc/passwd && chmod 0600 /etc/skel/.vnc/passwd

apps/blender.Dockerfile

@@ -1,4 +1,4 @@
-FROM thomasloven/novnc-ubuntu
+FROM thomasloven/novnc-base
 
 RUN sudo apt-get update \
   && DEBIAN_FRONTEND=noninteractive \

apps/freecad.Dockerfile

@@ -1,4 +1,4 @@
-FROM thomasloven/novnc-ubuntu
+FROM thomasloven/novnc-base
 
 RUN sudo apt-get update \
   && DEBIAN_FRONTEND=noninteractive \

apps/musescore.Dockerfile

@@ -1,4 +1,4 @@
-FROM thomasloven/novnc-ubuntu
+FROM thomasloven/novnc-base
 
 RUN sudo apt-get update \
   && DEBIAN_FRONTEND=noninteractive \

apps/prusaslicer.Dockerfile

@@ -1,12 +1,12 @@
-FROM thomasloven/novnc-ubuntu
+FROM thomasloven/novnc-base
 
-ARG APPIMAGE=PrusaSlicer-2.8.1+linux-x64-newer-distros-GTK3-202409181416.AppImage
+ARG APPIMAGE=PrusaSlicer-2.8.1+linux-x64-older-distros-GTK3-202409181354.AppImage
 ARG URL=https://github.com/prusa3d/PrusaSlicer/releases/download/version_2.8.1/${APPIMAGE}
 
 RUN sudo apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   sudo apt-get install -y \
-    libgtk-3-dev libglu1-mesa libwebkit2gtk-4.1-0 \
+    libgtk-3-dev libglu1-mesa libwebkit2gtk-4.0-37 \
     locales curl \
   && sudo locale-gen en \
   && curl -sSL ${URL} > ${APPIMAGE} \

build.sh

@@ -1,3 +0,0 @@
-docker build $@ -t thomasloven/novnc-ubuntu -f ubuntu.Dockerfile .
-docker build $@ -t thomasloven/novnc-debian -f debian.Dockerfile .
-docker build $@ -t thomasloven/novnc-alpine -f alpine.Dockerfile .

debian.Dockerfile

@@ -1,59 +0,0 @@
-FROM debian
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends\
-# Some basic helpers \
-        bash \
-        sudo \
-        git \
-        ca-certificates \
-        procps \
-\
-# X11 and XFCE \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends\
-        xvfb xauth dbus-x11 xfce4 xfce4-terminal \
-        x11-xserver-utils \
-\
-# VNC \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends\
-        python3 python3-numpy \
-        tigervnc-standalone-server tigervnc-common \
-        openssl \
-\
-# NoVNC \
-    && mkdir -p /opt/noVNC \
-    && git clone --single-branch https://github.com/novnc/noVNC.git /opt/noVNC \
-    && git clone --single-branch https://github.com/novnc/websockify.git /opt/noVNC/utils/websockify \
-    && ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html \
-    && openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem \
-    \
-# Audio requirements \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends\
-        pulseaudio \
-        pavucontrol \
-        ucspi-tcp \
-        gstreamer1.0-plugins-good \
-        gstreamer1.0-pulseaudio \
-        gstreamer1.0-tools
-
-
-COPY pulse/ /etc/pulse
-COPY novnc /opt/noVNC/
-RUN sed -i "/import RFB/a \
-        import '../webaudio.js'" \
-    /opt/noVNC/app/ui.js
-
-# Base applications
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends\
-        firefox-esr neovim
-
-COPY entrypoint.sh /opt/noVNC/entrypoint.sh
-
-ENTRYPOINT ["/opt/noVNC/entrypoint.sh"]
-EXPOSE 8080

entrypoint.sh

@@ -1,6 +1,5 @@
 #! /bin/bash
 
-
 shopt -s nullglob
 
 kill_pid() {
@@ -17,64 +16,42 @@ kill_pid ~/.pa-pid
 kill_pid ~/.tcp-pid
 kill_pid ~/.ws-pid
 
-
+# Clone and install dotfiles if DOTFILES_REPO is defined
-user_entrypoint() {
+if [ -n "$DOTFILES_REPO" ]; then
-  cd ~
+  if [ ! -d ~/dotfiles ]; then
-
+    git clone $DOTFILES_REPO ~/dotfiles
-  # Clone and install dotfiles if DOTFILES_REPO is defined
+    if [ -f ~/dotfiles/install.sh ]; then
-  if [ -n "$DOTFILES_REPO" ]; then
+      /bin/bash ~/dotfiles/install.sh
-    if [ ! -d ~/dotfiles ]; then
-      git clone --depth 1 --recurse-submodules --shallow-submodules $DOTFILES_REPO ~/dotfiles
-      if [ -f ~/dotfiles/install.sh ]; then
-        /bin/bash ~/dotfiles/install.sh
-      fi
     fi
   fi
-
-  # Launch VNC server - view :1 defaults to port 5901
-  vncserver :1 -SecurityTypes None -localhost no --I-KNOW-THIS-IS-INSECURE &
-  # vncserver :1 &
-  echo "$!" > ~/.vnc-pid
-
-  # Launch pulseaudio server
-  # /etc/pulse/client.conf and /etc/pulse/default.pa are setup to make a default
-  # audio sink which outputs to a socket at /tmp/pulseaudio.socket
-  DISPLAY=:0.0 pulseaudio --disallow-module-loading --disallow-exit --exit-idle-time=-1&
-  echo "$!" > ~/.pa-pid
-
-  # Use gstreamer to stream the pulseaudio source /tmp/pulseaudio.socket to stdout (fd=1)
-  # the tcpserver from ucspi-tcp pipes this to tcp port 6901
-  tcpserver localhost 6901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=12000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 &
-  echo "$!" > ~/.tcp-pid
-
-  # Websockify does three things:
-  # - publishes /opt/noVNC to http port 8080
-  # - proxies vnc port 5901 to 8080/websockify?token=vnc
-  # - proxies pulseaudio port 6901 to 8080/websockify?token=pulse
-  # The latter two are defined through the tokenfile
-  /opt/noVNC/utils/websockify/websockify.py --web /opt/noVNC 8080 --token-plugin=TokenFile --token-source=/opt/noVNC/tokenfile &
-  echo "$!" > ~/.ws-pid
-
-  if [ -n "$@" ]; then
-    DISPLAY=:1.0 exec "$@" &
-  fi
-
-  wait
-}
-
-uname=${USERNAME:-novnc}
-uid=${UUID:-1000}
-gid=${GUID:-1000}
-
-if ! id -u ${uname} > /dev/null 2>&1; then
-  addgroup --gid ${gid} ${uname}
-  adduser --home /home/${uname} --shell /bin/bash --system --disabled-password --uid ${uid} --ingroup ${uname} ${uname}
-  echo "${uname} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-  mkdir -p /home/${uname}
-  chown ${uname}:${uname} /home/${uname}
 fi
 
-export -f user_entrypoint
+# Launch VNC server - view :1 defaults to port 5901
-su ${uname} -c "bash -c user_entrypoint ${@}" &
+vncserver :1 -SecurityTypes None -localhost no --I-KNOW-THIS-IS-INSECURE &
+echo "$!" > ~/.vnc-pid
+
+# Launch pulseaudio server
+# /etc/pulse/client.conf and /etc/pulse/default.pa are setup to make a default
+# audio sink which outputs to a socket at /tmp/pulseaudio.socket
+DISPLAY=:0.0 pulseaudio --disallow-module-loading --disallow-exit --exit-idle-time=-1&
+echo "$!" > ~/.pa-pid
+
+# Use gstreamer to stream the pulseaudio source /tmp/pulseaudio.socket to stdout (fd=1)
+# the tcpserver from ucspi-tcp pipes this to tcp port 6901
+tcpserver localhost 6901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=12000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 &
+echo "$!" > ~/.tcp-pid
+
+# Websockify does three things:
+# - publishes /opt/noVNC to http port 8080
+# - proxies vnc port 5901 to 8080/websockify?token=vnc
+# - proxies pulseaudio port 6901 to 8080/websockify?token=pulse
+# The latter two are defined through the tokenfile
+/opt/noVNC/utils/websockify/websockify.py --web /opt/noVNC 8080 --token-plugin=TokenFile --token-source=/opt/noVNC/tokenfile &
+echo "$!" > ~/.ws-pid
+
+if [ -n "$@" ]; then
+  DISPLAY=:1.0 exec "$@" &
+fi
 
 wait
+

novnc/webaudio.js

@@ -134,7 +134,6 @@ const wa = new WebAudio(null);
 
 // Audio playback requires user interaction before being allowed by browsers
 const connect = () => {
-  if (MediaSource === undefined) return;
   if (!wa.connected)
     wa.start();
 };