Compare commits

..

No commits in common. "b7ce160dc39b58422baf6b568a26ea8ac80543eb" and "70609cdc2e9a3344669b10608ecabd282649e0dc" have entirely different histories.

11 changed files with 71 additions and 224 deletions

View File

@ -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 \
\
# X11 and XFCE \
procps
RUN mkdir -p /opt/noVNC
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 \
\
# VNC \
x11-xserver-utils
# 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 \
\
# NoVNC \
&& mkdir -p /opt/noVNC \
&& git clone --single-branch https://github.com/novnc/noVNC.git /opt/noVNC \
&& pip3 install numpy
# 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 \
&& openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem \
\
# Audio requirements \
&& ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html
RUN openssl req -batch -new -x509 -days 365 -nodes -out self.pem -keyout /opt/noVNC/utils/websockify/self.pem
# 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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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} \

View File

@ -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 .

View File

@ -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

View File

@ -1,6 +1,5 @@
#! /bin/bash
shopt -s nullglob
kill_pid() {
@ -17,14 +16,10 @@ kill_pid ~/.pa-pid
kill_pid ~/.tcp-pid
kill_pid ~/.ws-pid
user_entrypoint() {
cd ~
# Clone and install dotfiles if DOTFILES_REPO is defined
if [ -n "$DOTFILES_REPO" ]; then
if [ ! -d ~/dotfiles ]; then
git clone --depth 1 --recurse-submodules --shallow-submodules $DOTFILES_REPO ~/dotfiles
git clone $DOTFILES_REPO ~/dotfiles
if [ -f ~/dotfiles/install.sh ]; then
/bin/bash ~/dotfiles/install.sh
fi
@ -33,7 +28,6 @@ user_entrypoint() {
# 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
@ -60,21 +54,4 @@ user_entrypoint() {
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
su ${uname} -c "bash -c user_entrypoint ${@}" &
wait

View File

@ -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();
};