diff --git a/.docker/base/Dockerfile b/.docker/base/Dockerfile deleted file mode 100644 index fc20a27a..00000000 --- a/.docker/base/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# -# STAGE 1: SERVER -# -FROM golang:1.20-bullseye as server -WORKDIR /src - -# -# install dependencies -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ - # - # install libclipboard - set -eux; \ - cd /tmp; \ - git clone --depth=1 https://github.com/jtanx/libclipboard; \ - cd libclipboard; \ - cmake .; \ - make -j4; \ - make install; \ - rm -rf /tmp/libclipboard; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# build server -COPY server/ . -RUN ./build - -# -# STAGE 2: CLIENT -# -FROM node:18-bullseye-slim as client -WORKDIR /src - -# -# install dependencies -COPY client/package*.json ./ -RUN npm install - -# -# build client -COPY client/ . -RUN npm run build - -# -# STAGE 3: RUNTIME -# -FROM debian:bullseye-slim - -# -# avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# -# set custom user -ARG USERNAME=neko -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - -RUN set -eux; \ - apt-get update; \ - # - # install dependencies - apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ - apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ - apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6; \ - # - # gst - apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio; \ - # - # install fonts - apt-get install -y --no-install-recommends \ - # Google emojis - fonts-noto-color-emoji \ - # Japanese fonts - fonts-takao-mincho \ - # Chinese fonts - fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ - # Korean fonts - fonts-wqy-microhei; \ - # - # 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 /var/log/neko \ - /tmp/runtime-$USERNAME \ - /home/$USERNAME/.config/pulse \ - /home/$USERNAME/.local/share/xorg; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy config files -COPY server/runtime/dbus /usr/bin/dbus -COPY server/runtime/default.pa /etc/pulse/default.pa -COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf -COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf -COPY server/runtime/xorg.conf /etc/neko/xorg.conf - -# -# set default envs -ENV USER=$USERNAME -ENV DISPLAY=:99.0 -ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket -ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME -ENV NEKO_PASSWORD=neko -ENV NEKO_PASSWORD_ADMIN=admin -ENV NEKO_BIND=:8080 - -# -# copy static files from previous stages -COPY --from=server /src/bin/neko /usr/bin/neko -COPY --from=client /src/dist/ /var/www - -HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ - CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1 - -# -# run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/.docker/base/Dockerfile.arm b/.docker/base/Dockerfile.arm deleted file mode 100644 index 54f58ac0..00000000 --- a/.docker/base/Dockerfile.arm +++ /dev/null @@ -1,149 +0,0 @@ -# -# STAGE 1: SERVER -# -FROM golang:1.20-bullseye as server -WORKDIR /src - -# -# install dependencies -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make python2 libx11-dev libxrandr-dev libxtst-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx; \ - # - # install libclipboard - set -eux; \ - cd /tmp; \ - git clone --depth=1 https://github.com/jtanx/libclipboard; \ - cd libclipboard; \ - cmake .; \ - make -j4; \ - make install; \ - rm -rf /tmp/libclipboard; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# build server -COPY server/ . -RUN ./build - -# -# STAGE 2: CLIENT -# -# -# Because client builds fail in Github Actions, therefor we build it outside of Docker. -# -# FROM node:18-bullseye-slim as client -# -# # install dependencies -# RUN set -eux; apt-get update; \ -# apt-get install -y --no-install-recommends python2 build-essential -# -# WORKDIR /src -# -# # -# # install dependencies -# COPY client/package*.json ./ -# RUN npm install -# -# # -# # build client -# COPY client/ . -# RUN npm run build -# -# -# STAGE 3: RUNTIME -# -FROM debian:bullseye-slim - -# -# avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# -# set custom user -ARG USERNAME=neko -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - -RUN set -eux; \ - apt-get update; \ - # - # install dependencies - apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ - apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ - apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6; \ - # - # gst - apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio \ - gstreamer1.0-omx; \ - # - # install fonts - apt-get install -y --no-install-recommends \ - # Google emojis - fonts-noto-color-emoji \ - # Japanese fonts - fonts-takao-mincho \ - # Chinese fonts - fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ - # Korean fonts - fonts-wqy-microhei; \ - # - # 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 /var/log/neko \ - /tmp/runtime-$USERNAME \ - /home/$USERNAME/.config/pulse \ - /home/$USERNAME/.local/share/xorg; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy config files -COPY server/runtime/dbus /usr/bin/dbus -COPY server/runtime/default.pa /etc/pulse/default.pa -COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf -COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf -COPY server/runtime/xorg.conf /etc/neko/xorg.conf - -# -# set default envs -ENV USER=$USERNAME -ENV DISPLAY=:99.0 -ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket -ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME -ENV NEKO_PASSWORD=neko -ENV NEKO_PASSWORD_ADMIN=admin -ENV NEKO_BIND=:8080 - -# -# copy static files from previous stages -COPY --from=server /src/bin/neko /usr/bin/neko -# COPY --from=client /src/dist/ /var/www -COPY client/dist/ /var/www - -HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ - CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1 - -# -# run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/.docker/base/Dockerfile.intel b/.docker/base/Dockerfile.intel deleted file mode 100644 index fcb885e9..00000000 --- a/.docker/base/Dockerfile.intel +++ /dev/null @@ -1,152 +0,0 @@ -# -# STAGE 1: SERVER -# -FROM golang:1.20-bullseye as server -WORKDIR /src - -# -# install dependencies -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ - # - # install libclipboard - set -eux; \ - cd /tmp; \ - git clone --depth=1 https://github.com/jtanx/libclipboard; \ - cd libclipboard; \ - cmake .; \ - make -j4; \ - make install; \ - rm -rf /tmp/libclipboard; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# build server -COPY server/ . -RUN ./build - -# -# STAGE 2: CLIENT -# -FROM node:18-bullseye-slim as client -WORKDIR /src - -# -# install dependencies -COPY client/package*.json ./ -RUN npm install - -# -# build client -COPY client/ . -RUN npm run build - -# -# STAGE 3: RUNTIME -# -FROM debian:bullseye-slim - -# -# avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# -# set custom user -ARG USERNAME=neko -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - -RUN set -eux; \ - # - # add non-free repo for intel drivers - echo deb http://deb.debian.org/debian bullseye main contrib non-free > /etc/apt/sources.list; \ - echo deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free >> /etc/apt/sources.list; \ - echo deb http://deb.debian.org/debian bullseye-updates main contrib non-free >> /etc/apt/sources.list; \ - apt-get update; \ - # - # install dependencies - apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ - apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ - apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6; \ - # - # intel driver + vaapi - apt-get install -y --no-install-recommends intel-media-va-driver-non-free libva2 vainfo; \ - # - # gst + vaapi plugin - apt-get install -y --no-install-recommends libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-pulseaudio \ - gstreamer1.0-vaapi; \ - # - # install fonts - apt-get install -y --no-install-recommends \ - # Google emojis - fonts-noto-color-emoji \ - # Japanese fonts - fonts-takao-mincho \ - # Chinese fonts - fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ - # Korean fonts - fonts-wqy-microhei; \ - # - # 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 /var/log/neko \ - /tmp/runtime-$USERNAME \ - /home/$USERNAME/.config/pulse \ - /home/$USERNAME/.local/share/xorg; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy config files -COPY server/runtime/dbus /usr/bin/dbus -COPY server/runtime/default.pa /etc/pulse/default.pa -COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf -COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf -COPY server/runtime/xorg.conf /etc/neko/xorg.conf -COPY server/runtime/intel/add-render-group.sh /usr/bin/add-render-group.sh -COPY server/runtime/intel/supervisord.rendergroup.conf /etc/neko/supervisord/supervisord.rendergroup.conf - -# -# set default envs -ENV USER=$USERNAME -ENV DISPLAY=:99.0 -ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket -ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME -ENV NEKO_PASSWORD=neko -ENV NEKO_PASSWORD_ADMIN=admin -ENV NEKO_BIND=:8080 -ENV NEKO_HWENC=VAAPI -ENV RENDER_GID= - -# -# copy static files from previous stages -COPY --from=server /src/bin/neko /usr/bin/neko -COPY --from=client /src/dist/ /var/www - -HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ - CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1 - -# -# run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/.docker/base/Dockerfile.nvidia b/.docker/base/Dockerfile.nvidia deleted file mode 100644 index b447dc8e..00000000 --- a/.docker/base/Dockerfile.nvidia +++ /dev/null @@ -1,295 +0,0 @@ -ARG UBUNTU_RELEASE=20.04 -ARG CUDA_VERSION=11.4.3 -ARG VIRTUALGL_VERSION=3.1 -ARG GSTREAMER_VERSION=1.20 - -# -# STAGE 0: Build gstreamer with nvidia plugins. -# -FROM ubuntu:${UBUNTU_RELEASE} AS gstreamer -ARG GSTREAMER_VERSION - -# -# install dependencies -ENV DEBIAN_FRONTEND=noninteractive -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - # Install essentials - curl build-essential ca-certificates git \ - # Install pip and ninja - python3-pip python-gi-dev ninja-build \ - # Install build deps - autopoint autoconf automake autotools-dev libtool gettext bison flex gtk-doc-tools \ - # Install libraries - librtmp-dev \ - libvo-aacenc-dev \ - libtool-bin \ - libgtk2.0-dev \ - libgl1-mesa-dev \ - libopus-dev \ - libpulse-dev \ - libssl-dev \ - libx264-dev \ - libvpx-dev; \ - # Install meson - pip3 install meson; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# build gstreamer -RUN set -eux; \ - git clone --depth 1 --branch $GSTREAMER_VERSION https://gitlab.freedesktop.org/gstreamer/gstreamer.git /gstreamer/src; \ - cd /gstreamer/src; \ - mkdir -p /opt/gstreamer; \ - meson --prefix /opt/gstreamer \ - -Dgpl=enabled \ - -Dugly=enabled \ - -Dgst-plugins-ugly:x264=enabled \ - build; \ - ninja -C build; \ - meson install -C build; - -# -# STAGE 1: SERVER -# -FROM golang:1.20-bullseye as server -WORKDIR /src - -# -# install dependencies -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \ - # - # install libclipboard - set -eux; \ - cd /tmp; \ - git clone --depth=1 https://github.com/jtanx/libclipboard; \ - cd libclipboard; \ - cmake .; \ - make -j4; \ - make install; \ - rm -rf /tmp/libclipboard; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# build server -COPY server/ . -RUN ./build - -# -# STAGE 2: CLIENT -# -FROM node:18-bullseye-slim as client -WORKDIR /src - -# -# install dependencies -COPY client/package*.json ./ -RUN npm install - -# -# build client -COPY client/ . -RUN npm run build - -# -# STAGE 3: RUNTIME -# -FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime - -ARG UBUNTU_RELEASE -ARG VIRTUALGL_VERSION - -# Make all NVIDIA GPUs visible by default -ENV NVIDIA_VISIBLE_DEVICES all -# All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work -ENV NVIDIA_DRIVER_CAPABILITIES all - -# -# set vgl-display to headless 3d gpu card/// correct values are egl[n] or /dev/dri/card0:if this is passed into container -ENV VGL_DISPLAY egl - -# -# avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# -# set custom user -ARG USERNAME=neko -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - -RUN set -eux; \ - dpkg --add-architecture i386; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - # opengl base: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/base/Dockerfile - libxau6 libxau6:i386 \ - libxdmcp6 libxdmcp6:i386 \ - libxcb1 libxcb1:i386 \ - libxext6 libxext6:i386 \ - libx11-6 libx11-6:i386 \ - # opengl runtime: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/glvnd/runtime/Dockerfile - libglvnd0 libglvnd0:i386 \ - libgl1 libgl1:i386 \ - libglx0 libglx0:i386 \ - libegl1 libegl1:i386 \ - libgles2 libgles2:i386 \ - # hardware accleration utilities - libglu1 libglu1:i386 \ - libvulkan-dev libvulkan-dev:i386 \ - mesa-utils mesa-utils-extra \ - mesa-va-drivers mesa-vulkan-drivers \ - vainfo vdpauinfo; \ - # - # install vulkan-utils or vulkan-tools depending on ubuntu release - if [ "${UBUNTU_RELEASE}" = "18.04" ]; then \ - apt-get install -y --no-install-recommends vulkan-utils; \ - else \ - apt-get install -y --no-install-recommends vulkan-tools; \ - fi; \ - # - # create symlink for libnvrtc.so (needed for cudaconvert) - find /usr/local/cuda/lib64/ -maxdepth 1 -type l -name "*libnvrtc.so.*" -exec sh -c 'ln -sf {} /usr/local/cuda/lib64/libnvrtc.so' \;; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# add cuda to ld path, for gstreamer cuda plugins -ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}:/usr/local/cuda/lib:/usr/local/cuda/lib64" - -RUN set -eux; \ - apt-get update; \ - # - # install dependencies - apt-get install -y --no-install-recommends wget ca-certificates supervisor; \ - apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ - apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 libvo-aacenc0 librtmp1; \ - apt-get install -y --no-install-recommends libgtk-3-bin software-properties-common cabextract aptitude vim curl; \ - # - # install fonts - apt-get install -y --no-install-recommends \ - # Google emojis - fonts-noto-color-emoji \ - # Japanese fonts - fonts-takao-mincho \ - # Chinese fonts - fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ - # Korean fonts - fonts-wqy-microhei; \ - # - # 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 /var/log/neko \ - /tmp/runtime-$USERNAME \ - /home/$USERNAME/.config/pulse \ - /home/$USERNAME/.local/share/xorg; \ - chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# configure EGL and Vulkan manually -RUN VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \ - # Configure EGL manually - mkdir -p /usr/share/glvnd/egl_vendor.d/ && \ - echo "{\n\ - \"file_format_version\" : \"1.0.0\",\n\ - \"ICD\": {\n\ - \"library_path\": \"libEGL_nvidia.so.0\"\n\ - }\n\ -}" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json && \ - # Configure Vulkan manually - mkdir -p /etc/vulkan/icd.d/ && \ - echo "{\n\ - \"file_format_version\" : \"1.0.0\",\n\ - \"ICD\": {\n\ - \"library_path\": \"libGLX_nvidia.so.0\",\n\ - \"api_version\" : \"${VULKAN_API_VERSION}\"\n\ - }\n\ -}" > /etc/vulkan/icd.d/nvidia_icd.json - -# -# install VirtualGL and make libraries available for preload -RUN set -eux; \ - apt-get update; \ - wget "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb"; \ - wget "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ - apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb; \ - rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \ - chmod u+s /usr/lib/libvglfaker.so; \ - chmod u+s /usr/lib/libdlfaker.so; \ - chmod u+s /usr/lib32/libvglfaker.so; \ - chmod u+s /usr/lib32/libdlfaker.so; \ - chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so; \ - chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/*; - -# -# copy config files -COPY server/runtime/dbus /usr/bin/dbus -COPY server/runtime/default.pa /etc/pulse/default.pa -COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf -COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf -COPY server/runtime/xorg.conf /etc/neko/xorg.conf -COPY server/runtime/nvidia/entrypoint.sh /bin/entrypoint.sh - -# -# set default envs -ENV USER=$USERNAME -ENV DISPLAY=:99.0 -ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket -ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME -ENV NEKO_PASSWORD=neko -ENV NEKO_PASSWORD_ADMIN=admin -ENV NEKO_BIND=:8080 - -# -# set gstreamer envs -ENV PATH="/opt/gstreamer/bin:${PATH}" -ENV LD_LIBRARY_PATH="/opt/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" -ENV PKG_CONFIG_PATH="/opt/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" - -# -# copy gstreamer from previous stage -COPY --from=gstreamer /opt/gstreamer /opt/gstreamer - -# -# copy static files from previous stages -COPY --from=server /src/bin/neko /usr/bin/neko -COPY --from=client /src/dist/ /var/www - -HEALTHCHECK --interval=10s --timeout=5s --retries=8 \ - CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1 - -# -# run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] diff --git a/server/Dockerfile.arm b/server/Dockerfile.arm new file mode 100644 index 00000000..b9fe13d9 --- /dev/null +++ b/server/Dockerfile.arm @@ -0,0 +1,191 @@ +ARG BASE_IMAGE=debian:bullseye-slim +ARG BUILD_IMAGE=golang:1.21-bullseye + +# +# 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 \ + 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; \ + 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 python2 \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ + # + # 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 gstreamer1.0-omx; \ + # 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; \ + 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 /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ + chmod 1777 /var/log/neko; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ + 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 \ + fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + fonts-takao-mincho \ + # Korean fonts + fonts-unfonts-core \ + fonts-wqy-microhei \ + # 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/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 + +# +# 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 XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME +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", "-c", "/etc/neko/supervisord.conf"] diff --git a/server/Dockerfile.intel b/server/Dockerfile.intel new file mode 100644 index 00000000..ac1e27bd --- /dev/null +++ b/server/Dockerfile.intel @@ -0,0 +1,203 @@ +ARG BASE_IMAGE=debian:bullseye-slim +ARG BUILD_IMAGE=golang:1.21-bullseye + +# +# 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 \ + 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; \ + 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; \ + # + # add non-free repo for intel drivers + echo deb http://deb.debian.org/debian bullseye main contrib non-free > /etc/apt/sources.list; \ + echo deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free >> /etc/apt/sources.list; \ + echo deb http://deb.debian.org/debian bullseye-updates main contrib non-free >> /etc/apt/sources.list; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + wget ca-certificates supervisor \ + pulseaudio dbus-x11 xserver-xorg-video-dummy \ + libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \ + # + # intel driver + vaapi + intel-media-va-driver-non-free libva2 vainfo \ + # + # 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 gstreamer1.0-vaapi; \ + # 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; \ + 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 /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ + chmod 1777 /var/log/neko; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ + 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 \ + fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \ + # Japanese fonts + fonts-ipafont-mincho fonts-ipafont-gothic \ + fonts-takao-mincho \ + # Korean fonts + fonts-unfonts-core \ + fonts-wqy-microhei \ + # 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/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 +COPY runtime/intel/add-render-group.sh /usr/bin/add-render-group.sh +COPY runtime/intel/supervisord.rendergroup.conf /etc/neko/supervisord/supervisord.rendergroup.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 XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME +ENV NEKO_SERVER_BIND=:8080 +ENV NEKO_PLUGINS_ENABLED=true +ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ +ENV NEKO_HWENC=VAAPI +ENV RENDER_GID= + +# +# 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", "-c", "/etc/neko/supervisord.conf"] diff --git a/server/dev/build b/server/dev/build index 50d9876b..70b90862 100755 --- a/server/dev/build +++ b/server/dev/build @@ -12,6 +12,9 @@ GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` if [ "$1" = "nvidia" ]; then echo "Building nvidia docker image" DOCKERFILE="Dockerfile.nvidia" +elif [ "$1" = "intel" ]; then + echo "Building intel docker image" + DOCKERFILE="Dockerfile.intel" else echo "Building default docker image" DOCKERFILE="Dockerfile"