Bullseye alongside Bookworm

.devcontainer/Dockerfile

@@ -58,7 +58,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         wget ca-certificates supervisor \
-        pulseaudio xserver-xorg-video-dummy \
+        pulseaudio dbus-x11 xserver-xorg-video-dummy \
         libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \
         #
         # needed for profile upload preStop hook
@@ -122,6 +122,7 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
 COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
 
 # copy runtime files
+COPY runtime/dbus /usr/bin/dbus
 COPY runtime/default.pa /etc/pulse/default.pa
 COPY runtime/supervisord.conf /etc/neko/supervisord.conf
 COPY runtime/xorg.conf /etc/neko/xorg.conf
@@ -132,7 +133,8 @@ COPY dev/runtime/config.yml /etc/neko/neko.yml
 COPY dev/runtime/supervisord.conf /etc/neko/supervisord/dev.conf
 
 # customized scripts
-RUN echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \
+RUN chmod +x /usr/bin/dbus;\
+    echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \
     chmod +x /usr/bin/neko; \
     echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \
     chmod +x /usr/bin/deps; \

.github/workflows/build_variants.yml

@@ -19,7 +19,12 @@ jobs:
     strategy:
       matrix:
         include:
+          - variant: bookworm
+            dockerfile: Dockerfile.bookworm
           - variant: nvidia
+            dockerfile: Dockerfile.nvidia
+          - variant: nvidia_bookworm
+            dockerfile: Dockerfile.nvidia.bookworm
 
     steps:
       - name: Checkout repository
@@ -42,7 +47,7 @@ jobs:
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
-          file: Dockerfile.${{ matrix.variant }}
+          file: ${{ matrix.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,7 +1,10 @@
+ARG BASE_IMAGE=debian:bullseye-slim
+ARG BUILD_IMAGE=golang:1.21-bullseye
+
 #
 # Stage 0: Build xorg dependencies.
 #
-FROM debian:bookworm-slim as xorg-deps
+FROM $BASE_IMAGE as xorg-deps
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -15,13 +18,12 @@ WORKDIR /xorg
 
 COPY xorg/ /xorg/
 
-# build xserver-xorg-video-dummy 0.3.8-2 with RandR support.
+# build xf86-video-dummy v0.3.8 with RandR support
 RUN set -eux; \
-    cd xf86-video-dummy; \
-    git clone --depth 1 --branch xserver-xorg-video-dummy-1_0.3.8-2 https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-dummy; \
-    cd xserver-xorg-video-dummy; \
-    patch -p1 < ../xdummy-randr.patch; \
-    ./autogen.sh; \
+    cd xf86-video-dummy/v0.3.8; \
+    patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \
+    autoreconf -v --install; \
+    ./configure; \
     make -j$(nproc); \
     make install;
 
@@ -36,7 +38,7 @@ RUN set -eux; \
 #
 # Stage 1: Build.
 #
-FROM golang:1.21-bookworm as build
+FROM $BUILD_IMAGE as build
 WORKDIR /src
 
 #
@@ -45,8 +47,12 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \
+        libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \
         libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \
+    # install libxcvt-dev (not available in debian:bullseye)
+    wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt-dev_0.1.2-1_amd64.deb; \
+    wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \
+    apt-get install  --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb ./libxcvt-dev_0.1.2-1_amd64.deb; \
     #
     # clean up
     apt-get clean -y; \
@@ -64,7 +70,7 @@ RUN ./build
 #
 # Stage 2: Runtime.
 #
-FROM debian:bookworm-slim as runtime
+FROM $BASE_IMAGE as runtime
 
 #
 # set custom user
@@ -79,8 +85,8 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         wget ca-certificates supervisor \
-        pulseaudio xserver-xorg-video-dummy \
-        libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \
+        pulseaudio dbus-x11 xserver-xorg-video-dummy \
+        libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \
         #
         # needed for profile upload preStop hook
         zip curl \
@@ -92,6 +98,10 @@ RUN set -eux; \
         gstreamer1.0-plugins-base gstreamer1.0-plugins-good \
         gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
         gstreamer1.0-pulseaudio; \
+    # install libxcvt0 (not available in debian:bullseye)
+    wget http://ftp.de.debian.org/debian/pool/main/libx/libxcvt/libxcvt0_0.1.2-1_amd64.deb; \
+    apt-get install  --no-install-recommends ./libxcvt0_0.1.2-1_amd64.deb; \
+    rm ./libxcvt0_0.1.2-1_amd64.deb; \
     #
     # create a non-root user
     groupadd --gid $USER_GID $USERNAME; \
@@ -133,8 +143,10 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xor
 #
 # copy runtime configs
 COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources
+COPY runtime/dbus /usr/bin/dbus
 COPY runtime/default.pa /etc/pulse/default.pa
 COPY runtime/supervisord.conf /etc/neko/supervisord.conf
+COPY runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf
 COPY runtime/xorg.conf /etc/neko/xorg.conf
 
 #

Dockerfile.bookworm

@@ -0,0 +1,172 @@
+ARG BASE_IMAGE=debian:bookworm-slim
+ARG BUILD_IMAGE=golang:1.21-bookworm
+
+#
+# Stage 0: Build xorg dependencies.
+#
+FROM $BASE_IMAGE as xorg-deps
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y \
+        git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \
+    && rm -rf /var/lib/apt/lists/*;
+
+WORKDIR /xorg
+
+COPY xorg/ /xorg/
+
+# build xf86-video-dummy v0.3.8 with RandR support
+RUN set -eux; \
+    cd xf86-video-dummy/v0.3.8; \
+    patch -p1 < ../01_v0.3.8_xdummy-randr.patch; \
+    autoreconf -v --install; \
+    ./configure; \
+    make -j$(nproc); \
+    make install;
+
+# build custom input driver
+RUN set -eux; \
+    cd xf86-input-neko; \
+    ./autogen.sh --prefix=/usr; \
+    ./configure; \
+    make -j$(nproc); \
+    make install;
+
+#
+# Stage 1: Build.
+#
+FROM $BUILD_IMAGE as build
+WORKDIR /src
+
+#
+# install dependencies
+ENV DEBIAN_FRONTEND=noninteractive
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev libxcvt-dev \
+        libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \
+    #
+    # clean up
+    apt-get clean -y; \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+ARG GIT_COMMIT
+ARG GIT_BRANCH
+ARG GIT_TAG
+
+#
+# build server
+COPY . .
+RUN ./build
+
+#
+# Stage 2: Runtime.
+#
+FROM $BASE_IMAGE as runtime
+
+#
+# set custom user
+ARG USERNAME=neko
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+#
+# install dependencies
+ENV DEBIAN_FRONTEND=noninteractive
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        wget ca-certificates supervisor \
+        pulseaudio xserver-xorg-video-dummy \
+        libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \
+        #
+        # needed for profile upload preStop hook
+        zip curl \
+        #
+        # file chooser handler, clipboard, drop
+        xdotool xclip libgtk-3-0 \
+        #
+        # gst
+        gstreamer1.0-plugins-base gstreamer1.0-plugins-good \
+        gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
+        gstreamer1.0-pulseaudio; \
+    #
+    # create a non-root user
+    groupadd --gid $USER_GID $USERNAME; \
+    useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \
+    adduser $USERNAME audio; \
+    adduser $USERNAME video; \
+    adduser $USERNAME pulse; \
+    #
+    # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
+    mkdir /tmp/.X11-unix; \
+    chmod 1777 /tmp/.X11-unix; \
+    chown $USERNAME /tmp/.X11-unix/; \
+    #
+    # make directories for neko
+    mkdir -p /etc/neko /var/www; \
+    chown -R $USERNAME:$USERNAME /home/$USERNAME; \
+    #
+    # install fonts
+    apt-get install -y --no-install-recommends \
+        # Emojis
+        fonts-noto-color-emoji \
+        # Chinese fonts
+        fonts-arphic-ukai fonts-arphic-uming \
+        # Japanese fonts
+        fonts-ipafont-mincho fonts-ipafont-gothic \
+        # Korean fonts
+        fonts-unfonts-core \
+        # Indian fonts
+        fonts-indic; \
+    #
+    # clean up
+    apt-get clean -y; \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+# copy dependencies from previous stage
+COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so
+COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
+
+#
+# copy runtime configs
+COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources
+COPY runtime/default.pa /etc/pulse/default.pa
+COPY runtime/supervisord.conf /etc/neko/supervisord.conf
+COPY runtime/xorg.conf /etc/neko/xorg.conf
+
+#
+# copy runtime folders
+COPY --chown=neko:neko runtime/icon-theme /home/$USERNAME/.icons/default
+COPY runtime/fontconfig/* /etc/fonts/conf.d/
+COPY runtime/fonts /usr/local/share/fonts
+
+#
+# set default envs
+ENV USER=$USERNAME
+ENV DISPLAY=:99.0
+ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
+ENV NEKO_SERVER_BIND=:8080
+ENV NEKO_PLUGINS_ENABLED=true
+ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/
+
+#
+# copy plugins from previous stage
+COPY --from=build /src/bin/plugins/ $NEKO_PLUGINS_DIR
+
+#
+# copy executable from previous stage
+COPY --from=build /src/bin/neko /usr/bin/neko
+
+#
+# add healthcheck
+HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
+    CMD wget -O - http://localhost:${NEKO_SERVER_BIND#*:}/health || exit 1
+
+#
+# run neko
+CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"]