fix nomachine (#47)

* fix nomachine

* create /run/user/1000

* remove dbus

* update docker config

Author: gezp

ubuntu-desktop/18.04/Dockerfile

@@ -63,7 +63,7 @@ RUN apt-get update && \
 Pin: release o=LP-PPA-mozillateam\n\
 Pin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox &&\
     # install xfce4 and firefox
-    apt-get install -y xfce4 terminator fonts-wqy-zenhei ffmpeg firefox &&\
+    apt-get install -y xfce4 terminator fonts-wqy-zenhei pulseaudio ffmpeg firefox &&\
     # disable terminator dbus
     sed -i "s/python/python2/" /usr/share/terminator/terminator &&\
     sed -i "s/if OPTIONS.nodbus:/if True:/" /usr/share/terminator/terminator &&\
@@ -73,10 +73,6 @@ Pin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox &&\
     update-locale LC_CTYPE=C.UTF-8 &&\
     rm -rf /var/lib/apt/lists/*
 
-ENV DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
-RUN apt-get update && apt-get install -y pulseaudio && mkdir -p /var/run/dbus &&\
-    rm -rf /var/lib/apt/lists/*
-
 ## Install remote desktop and other apps
 RUN bash /docker_config/post_install.sh &&\
     rm -rf /var/lib/apt/lists/*

ubuntu-desktop/20.04/Dockerfile

@@ -63,7 +63,7 @@ RUN apt-get update && \
 Pin: release o=LP-PPA-mozillateam\n\
 Pin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox &&\
     # install xfce4 and firefox
-    apt-get install -y xfce4 terminator fonts-wqy-zenhei ffmpeg firefox &&\
+    apt-get install -y xfce4 terminator fonts-wqy-zenhei pulseaudio ffmpeg firefox &&\
     # set firefox as default web browser
     update-alternatives --set x-www-browser /usr/bin/firefox &&\
     rm -rf /var/lib/apt/lists/*

ubuntu-desktop/22.04/Dockerfile

@@ -63,17 +63,13 @@ RUN apt-get update && \
 Pin: release o=LP-PPA-mozillateam\n\
 Pin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox &&\
     # install xfce4 and firefox
-    apt-get install -y xfce4 terminator fonts-wqy-zenhei ffmpeg firefox &&\
+    apt-get install -y xfce4 terminator fonts-wqy-zenhei pulseaudio ffmpeg firefox &&\
     # remove and disable screensaver
     apt-get remove -y xfce4-screensaver --purge &&\
     # set firefox as default web browser
     update-alternatives --set x-www-browser /usr/bin/firefox &&\
     rm -rf /var/lib/apt/lists/*
 
-ENV DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
-RUN apt-get update && apt-get install -y pulseaudio && mkdir -p /var/run/dbus &&\
-    rm -rf /var/lib/apt/lists/*
-
 ## Install remote desktop and other apps
 RUN bash /docker_config/post_install.sh &&\
     rm -rf /var/lib/apt/lists/*

ubuntu-desktop/24.04/Dockerfile

@@ -66,17 +66,13 @@ RUN apt-get update && \
 Pin: release o=LP-PPA-mozillateam\n\
 Pin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox &&\
     # install xfce4 and firefox
-    apt-get install -y xfce4 terminator fonts-wqy-zenhei ffmpeg firefox dbus-x11 &&\
+    apt-get install -y xfce4 terminator fonts-wqy-zenhei pulseaudio ffmpeg firefox dbus-x11 &&\
     # remove and disable screensaver
     apt-get remove -y xfce4-screensaver --purge &&\
     # set firefox as default web browser
     update-alternatives --set x-www-browser /usr/bin/firefox &&\
     rm -rf /var/lib/apt/lists/*
 
-ENV DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
-RUN apt-get update && apt-get install -y pulseaudio && mkdir -p /var/run/dbus &&\
-    rm -rf /var/lib/apt/lists/*
-
 ## Configure ssh 
 RUN mkdir -p /var/run/sshd && \
     sed -i 's/#*PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config && \

ubuntu-desktop/docker_config/entrypoint.sh

@@ -14,6 +14,9 @@ if [ ! -f "/docker_config/init_flag" ]; then
     echo "root:$PASSWORD" | chpasswd
     echo "$USER:$PASSWORD" | chpasswd
     chsh -s /bin/bash $USER
+    # /run/user/$UID
+    mkdir -p /run/user/$UID
+    chown $GID:$UID /run/user/$UID
     # extra env init for developer
     if [ -f "/docker_config/env_init.sh" ]; then
         bash /docker_config/env_init.sh
@@ -31,8 +34,6 @@ if [ -f "/docker_config/custom_startup.sh" ]; then
 fi
 # start sshd
 /usr/sbin/sshd
-# start dbus
-/etc/init.d/dbus start
 # start coder server
 if [ ! -z ${DISABLE_HTTPS+x} ]; then
     su $USER -c "code-server --bind-addr=0.0.0.0:5000 &"

ubuntu-desktop/docker_config/install_code_server.sh

@@ -1,8 +1,17 @@
 #!/bin/sh
+arch=$(dpkg --print-architecture)
+codename=$(lsb_release --short --codename)
+# update
 apt-get update
 # Install remote desktop (nomachine,kasmvnc,novnc)
 bash /docker_config/install_nomachine.sh
 bash /docker_config/install_kasmvnc.sh
 bash /docker_config/install_novnc.sh
 # Install code server
-bash /docker_config/install_code_server.sh
+CODE_VERSION=4.103.2
+if [[ $codename == 'bionic' ]]; then
+    CODE_VERSION=4.16.1
+fi
+curl -fSL "https://github.com/coder/code-server/releases/download/v${CODE_VERSION}/code-server_${CODE_VERSION}_${arch}.deb" -o code-server.deb
+dpkg -i ./code-server.deb
+rm code-server.deb

ubuntu-desktop/docker_config/post_install.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 /etc/NX/nxserver --startup
-tail -f /usr/NX/var/log/nxserver.log
+tail -f /usr/NX/var/log/*.log