fix regression for #522. #523

* keep only openMobileKeyboard, do not focus when touch device.

* do not test for hover when checking touch device.

.docker/.env.default

@@ -1,18 +0,0 @@
-#
-# you can copy this file to .env.local, if you don't want to have it pushed to repository
-#
-
-# this is how will be your images called. you can change it to your fork.
-# only need to do this once. here.
-BUILD_IMAGE="m1k1o/neko"
-
-# this is where your services will be acessible
-CLIENT_PORT=8080
-SERVER_PORT=8081
-
-# on which image you want to test it
-SERVER_TAG="chromium"
-
-# this is needed for WebRTC. specify your local IP address and free UDP port range.
-SERVER_EPR=55000-55009
-SERVER_IP=10.8.0.1

.docker/README.md

@@ -1,40 +0,0 @@
-# How to contribute to neko
-
-If you want to contribute, but do not want to install anything on your host system, we got you covered. You only need docker. Technically, it could be done using vs code development in container, but this is more fun:).
-
-You need to copy `.env.default` to `.env` and customize values.
-
-## Step 1: Building server
-
-- `./build` - You can use this command to build your specified `SERVER_TAG` along with base image.
-
-If you want, you can build other tags. `base` tag needs to be build first:
-
-- `./build base`
-- `./build firefox`
-- `./build chromium`
-- `./build google-chrome`
-- etc...
-
-## Step 2: Starting server
-
-- `./start-server` - Starting server image you specified in `.env`.
-- `./start-server -r` - Shortcut for rebuilding server binary and then starting.
-
-If you are changing something in the server code, you do not want to rebuild container each time. You can just rebuild your binary:
-
-- `./rebuild-server` - Rebuild only server binary.
-- `./rebuild-server -f` - Force to rebuild whole Golang environment (you should do this only of you change some dependencies).
-
-## Step 3: Serving client
-
-- `./serve-client` - Serving vue.js client.
-- `./serve-client -i` - Install all dependencies.
-
-## Debug
-
-You can navigate to `CLIENT_PORT` and see live client there. It will be connected to your local server on `SERVER_PORT`.
-
-If you are leaving client as is and not changing it, you don't need to start `./serve-client` and you can access server's GUI directly on `SERVER_PORT`.
-
-Feel free to open new PR.

.docker/base/Dockerfile

@@ -1,137 +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 go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
-
-#
-# 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; \
-    #
-    # setup pulseaudio
-    mkdir -p /home/$USERNAME/.config/pulse/; \
-    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
-    #
-    # 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; \
-    chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/; \
-    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 .docker/base/dbus /usr/bin/dbus
-COPY .docker/base/default.pa /etc/pulse/default.pa
-COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf
-COPY .docker/base/xorg.conf /etc/neko/xorg.conf
-
-#
-# set default envs
-ENV USER=$USERNAME
-ENV DISPLAY=:99.0
-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"]

.docker/base/Dockerfile.arm

@@ -1,143 +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 go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
-
-#
-# STAGE 2: CLIENT
-#
-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; \
-    #
-    # setup pulseaudio
-    mkdir -p /home/$USERNAME/.config/pulse/; \
-    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
-    #
-    # 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; \
-    chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/; \
-    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 .docker/base/dbus /usr/bin/dbus
-COPY .docker/base/default.pa /etc/pulse/default.pa
-COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf
-COPY .docker/base/xorg.conf /etc/neko/xorg.conf
-
-#
-# set default envs
-ENV USER=$USERNAME
-ENV DISPLAY=:99.0
-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"]

.docker/base/Dockerfile.intel

@@ -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 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 go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
-
-#
-# 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; \
-    #
-    # setup pulseaudio
-    mkdir -p /home/$USERNAME/.config/pulse/; \
-    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
-    #
-    # 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; \
-    chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/; \
-    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 .docker/base/dbus /usr/bin/dbus
-COPY .docker/base/default.pa /etc/pulse/default.pa
-COPY .docker/base/intel/supervisord.conf /etc/neko/supervisord.conf
-COPY .docker/base/xorg.conf /etc/neko/xorg.conf
-COPY .docker/base/intel/add-render-group.sh /usr/bin/add-render-group.sh
-
-#
-# set default envs
-ENV USER=$USERNAME
-ENV DISPLAY=:99.0
-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"]

.docker/base/Dockerfile.nvidia

@@ -1,197 +0,0 @@
-ARG UBUNTU_RELEASE=20.04
-ARG CUDA_VERSION=11.2.2
-
-#
-# STAGE 1: SERVER
-#
-FROM golang:1.18-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 go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
-
-#
-# STAGE 2: CLIENT
-#
-FROM node:14-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 nvcr.io/nvidia/cudagl:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime
-
-ARG UBUNTU_RELEASE
-ARG CUDA_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; \
-    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; \
-    #
-    # hardware acclerations utilities
-    apt-get install -y --no-install-recommends libgtk-3-bin mesa-utils mesa-utils-extra mesa-va-drivers mesa-vulkan-drivers libvulkan-dev libvulkan-dev:i386 vdpauinfo; \
-    #
-    # 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; \
-    #
-    # setup pulseaudio
-    mkdir -p /home/$USERNAME/.config/pulse/; \
-    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
-    #
-    # 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; \
-    chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/; \
-    chown -R $USERNAME:$USERNAME /home/$USERNAME; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# install and configure Vulkan manually
-RUN set -eux; \
-    apt-get update; \
-    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; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*; \
-    #
-    # configure vulkan
-    VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)'); \
-    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
-ARG VIRTUALGL_VERSION=3.1
-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 .docker/base/dbus /usr/bin/dbus
-COPY .docker/base/default.pa /etc/pulse/default.pa
-COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf
-COPY .docker/base/xorg.conf /etc/neko/xorg.conf
-COPY .docker/base/nvidia/entrypoint.sh /bin/entrypoint.sh
-
-#
-# set default envs
-ENV USER=$USERNAME
-ENV DISPLAY=:99.0
-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"]

.docker/base/default.pa

@@ -1,7 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-
-# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices
-load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink

.docker/base/intel/supervisord.conf

@@ -1,69 +0,0 @@
-[supervisord]
-nodaemon=true
-user=root
-pidfile=/var/run/supervisord.pid
-logfile=/dev/null
-logfile_maxbytes=0
-loglevel=debug
-
-[include]
-files=/etc/neko/supervisord/*.conf
-
-[program:rendergroup-init]
-environment=RENDER_GID="%(ENV_RENDER_GID)s",USER="%(ENV_USER)s"
-command=/usr/bin/add-render-group.sh
-startsecs=0
-startretries=0
-autorestart=false
-priority=10
-user=root
-stdout_logfile=/var/log/neko/rendergroup.log
-stdout_logfile_maxbytes=1MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:dbus]
-environment=HOME="/root",USER="root"
-command=/usr/bin/dbus
-autorestart=true
-priority=100
-user=root
-stdout_logfile=/var/log/neko/dbus.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:x-server]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
-command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/xorg.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:pulseaudio]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallow-exit --exit-idle-time=-1
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/pulseaudio.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:neko]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/neko serve --static "/var/www"
-stopsignal=INT
-stopwaitsecs=5
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/neko.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/build

@@ -1,125 +0,0 @@
-#!/bin/sh
-set -ex
-cd "$(dirname "$0")"
-
-BASE="${PWD}/../"
-
-# BUILD_IMAGE from environment vairables has precedence
-if [ ! -z "${BUILD_IMAGE}" ]
-then
-  ENV_BUILD_IMAGE="${BUILD_IMAGE}"
-fi
-
-if [ -f ".env.default" ]
-then
-  export $(cat .env.default | sed 's/#.*//g' | xargs)
-fi
-
-if [ -f ".env" ]
-then
-  export $(cat .env | sed 's/#.*//g' | xargs)
-fi
-
-# BUILD_IMAGE from environment vairables has precedence
-if [ ! -z "${ENV_BUILD_IMAGE}" ]
-then
-  BUILD_IMAGE="${ENV_BUILD_IMAGE}"
-  unset ENV_BUILD_IMAGE
-fi
-
-if [ -z "${1}" ] && [ ! -z "${SERVER_TAG}" ]
-then
-  ./build base
-  ./build ${SERVER_TAG}
-  exit 0
-fi
-
-
-build_client() {
-  docker build -t neko-dev-client -f base/Dockerfile --target client "${BASE}"
-  docker run --rm \
-    --user "$(id -u):$(id -g)" \
-    -v "${BASE}client/dist:/tmp/dist" \
-    neko-dev-client sh -c "rm -rf /tmp/dist/*; cp -r /src/dist/* /tmp/dist"
-}
-
-build_server() {
-  docker build -t neko-dev-server -f base/Dockerfile --target server "${BASE}"
-  docker run --rm \
-    --user "$(id -u):$(id -g)" \
-    -v "${BASE}server/bin:/tmp/bin" \
-    neko-dev-server sh -c "rm -rf /tmp/bin/neko; cp /src/bin/neko /tmp/bin"
-}
-
-build() {
-  if [ "$1" = "base" ]
-  then
-    # build base
-    docker build -t "${BUILD_IMAGE}:base" -f base/Dockerfile "${BASE}"
-  else
-    # build image
-    docker build -t "${BUILD_IMAGE}:$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:base" -f "$1/Dockerfile" "$1/"
-  fi
-}
-
-build_arm() {
-  if [ "$1" = "base" ]
-  then
-    # build ARM base
-    docker build -t "${BUILD_IMAGE}:arm-base" -f base/Dockerfile.arm "${BASE}"
-  elif [ -f "$1/Dockerfile.arm" ]
-  then
-    # build dedicated ARM image
-    docker build -t "${BUILD_IMAGE}:arm-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:arm-base" -f "$1/Dockerfile.arm" "$1/"
-  else
-    # try to build ARM image with common Dockerfile
-    docker build -t "${BUILD_IMAGE}:arm-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:arm-base" -f "$1/Dockerfile" "$1/"
-  fi
-}
-
-build_intel() {
-  if [ "$1" = "base" ]
-  then
-    # build intel base
-    docker build -t "${BUILD_IMAGE}:intel-base" -f base/Dockerfile.intel "${BASE}"
-  elif [ -f "$1/Dockerfile.intel" ]
-  then
-    # build dedicated intel image
-    docker build -t "${BUILD_IMAGE}:intel-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:intel-base" -f "$1/Dockerfile.intel" "$1/"
-  else
-    # try to build intel image with common Dockerfile
-    docker build -t "${BUILD_IMAGE}:intel-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:intel-base" -f "$1/Dockerfile" "$1/"
-  fi
-}
-
-build_nvidia() {
-  if [ "$1" = "base" ]
-  then
-    # build nvidia base
-    docker build -t "${BUILD_IMAGE}:nvidia-base" -f base/Dockerfile.nvidia "${BASE}"
-  elif [ -f "$1/Dockerfile.nvidia" ]
-  then
-    # build dedicated nvidia image
-    docker build -t "${BUILD_IMAGE}:nvidia-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:nvidia-base" -f "$1/Dockerfile.nvidia" "$1/"
-  else
-    # try to build nvidia image with common Dockerfile
-    docker build -t "${BUILD_IMAGE}:nvidia-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:nvidia-base" -f "$1/Dockerfile" "$1/"
-  fi
-}
-
-case $1 in
-  client) build_client;;
-  server) build_server;;
-
-  # build arm- images
-  arm-*) build_arm "${1#arm-}";;
-
-  # build intel- images
-  intel-*) build_intel "${1#intel-}";;
-
-  # build nvidia- images
-  nvidia-*) build_nvidia "${1#nvidia-}";;
-
-  # build images
-  *) build "$1";;
-esac

.docker/chromium/Dockerfile

@@ -1,33 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:base
-FROM $BASE_IMAGE
-
-#
-# install neko chromium
-RUN set -eux; \
-    echo "deb http://ftp.de.debian.org/debian bookworm main" >> /etc/apt/sources.list; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends unzip chromium chromium-common chromium-sandbox openbox; \
-    #
-    # install widevine module
-    CHROMIUM_DIR="/usr/lib/chromium"; \
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \
-    wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
-    mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \
-    unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \
-    unzip -p /tmp/widevine.zip manifest.json > "${CHROMIUM_DIR}/WidevineCdm/manifest.json"; \
-    unzip -p /tmp/widevine.zip libwidevinecdm.so > "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"; \
-    find "${CHROMIUM_DIR}/WidevineCdm" -type d -exec chmod 0755 '{}' \;; \
-    find "${CHROMIUM_DIR}/WidevineCdm" -type f -exec chmod 0644 '{}' \;; \
-    rm /tmp/widevine.zip; \
-    #
-    # clean up
-    apt-get --purge autoremove -y unzip; \
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/chromium.conf
-COPY --chown=neko preferences.json /home/neko/.config/chromium/Default/Preferences
-COPY policies.json /etc/chromium/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/chromium/Dockerfile.arm

@@ -1,19 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:arm-base
-FROM $BASE_IMAGE
-
-#
-# install neko chromium
-RUN set -eux; apt-get update; \
-    # TODO: Bring back DRM support.
-    apt-get install -y --no-install-recommends chromium openbox; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/chromium.conf
-COPY --chown=neko preferences.json /home/neko/.config/chromium/Default/Preferences
-COPY policies.json /etc/chromium/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/firefox/Dockerfile.arm

@@ -1,30 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:arm-base
-FROM $BASE_IMAGE
-
-#
-# install firefox-esr
-RUN set -eux; apt-get update; \
-    # TODO: Bring back DRM support with arm32v7/debian:buster-slim image.
-    apt-get install -y --no-install-recommends openbox firefox-esr; \
-    #
-    # install extensions
-    mkdir -p /usr/lib/firefox-esr/distribution/extensions; \
-    wget -O '/usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi' https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi; \
-    wget -O '/usr/lib/firefox-esr/distribution/extensions/sponsorBlocker@ajay.app.xpi' https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi; \
-    #
-    # create a profile directory
-    mkdir -p /home/neko/.mozilla/firefox/profile.default/extensions; \
-    chown -R neko:neko /home/neko/.mozilla/firefox/profile.default; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/firefox.conf
-COPY neko.js /usr/lib/firefox-esr/mozilla.cfg
-COPY autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
-COPY policies.json /usr/lib/firefox-esr/distribution/policies.json
-COPY --chown=neko profiles.ini /home/neko/.mozilla/firefox/profiles.ini
-COPY openbox.xml /etc/neko/openbox.xml

.docker/rebuild-server

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-if [ -f ".env.default" ]
-then
-  export $(cat .env.default | sed 's/#.*//g' | xargs)
-fi
-
-if [ -f ".env" ]
-then
-  export $(cat .env | sed 's/#.*//g' | xargs)
-fi
-
-# use -f to force rebuild
-if [ "$(docker images -q neko_dev_server 2> /dev/null)" == "" ] || [ "$1" == "-f" ]; then
-  docker build -t neko_dev_server -f base/Dockerfile --target server ../
-fi
-
-docker run --rm -it \
-  -v "${PWD}/../server:/src" \
-  -e GIT_COMMIT=`git rev-parse --short HEAD` \
-  -e GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` \
-  -e GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` \
-  --entrypoint="bash" \
-  --workdir="/src" \
-  neko_dev_server ./build

.docker/remmina/run-remmina.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-set -u
-
-err() {
-  echo "ERROR: $*" >&2
-  exit 1
-}
-
-profile_dir="/home/neko/.local/share/remmina"
-if [[ -n "$REMMINA_PROFILE" ]]; then
-  profile=${REMMINA_PROFILE%.remmina}.remmina
-  file=${profile##/*/}
-  [[ "$file" = "$profile" ]] && profile="$profile_dir"/"$file"
-  [[ -f "$profile" ]] || err "Connection profile $profile not found"
-  echo "Running remmina with connection profile $profile"
-  exec remmina -c "$profile"
-fi
-
-[[ -z "$REMMINA_URL" ]] && err "Neither 'REMMINA_PROFILE' nor 'REMMINA_URL' found in env vars"
-
-readarray -t arr < <( echo -n "$REMMINA_URL" | perl -pe 's|^(\w+)\:\/\/(?:([^:]+)(?::([^@]+))?@)?(.*)$|\1\n\2\n\3\n\4|' )
-proto="${arr[0]}"
-user="${arr[1]}"
-pw="${arr[2]}"
-host="${arr[3]}"
-echo "Parsed url in 'REMMINA_URL': proto:$proto username:$user host:$host"
-
-[[ "$proto" != "vnc" && "$proto" != "rdp" && "$proto" != "spice" ]] && err "Unsupported protocol $proto in connection url 'REMMINA_URL'"
-
-profile="$profile_dir"/"$proto".remmina
-remmina --set-option username="$user" --update-profile "$profile"
-remmina --set-option password="$pw" --update-profile "$profile"
-remmina --set-option server="$host" --update-profile "$profile"
-
-# remmina --set-option window_maximize=1 --update-profile "$profile"
-# remmina --set-option scale=1 --update-profile "$profile"
-
-exec remmina -c "$profile"

.docker/serve-client

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ -f ".env.default" ]
-then
-  export $(cat .env.default | sed 's/#.*//g' | xargs)
-fi
-
-if [ -f ".env" ]
-then
-  export $(cat .env | sed 's/#.*//g' | xargs)
-fi
-
-# use -i to install
-if [ ! -d "${PWD}/../client/node_modules" ] || [ "$1" == "-i" ]; then
-  docker run --rm -it \
-    -v "${PWD}/../client:/app" \
-    --workdir="/app" \
-    --entrypoint="npm" \
-    node:18-bullseye-slim install
-fi
-
-docker run --rm -it \
-  -p "${CLIENT_PORT}:8080" \
-  -v "${PWD}/../client:/app" \
-  -e "VUE_APP_SERVER_PORT=${SERVER_PORT}" \
-  --workdir="/app" \
-  --entrypoint="npm" \
-  node:18-bullseye-slim run serve
-  

.docker/start-server

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-if [ -f ".env.default" ]
-then
-  export $(cat .env.default | sed 's/#.*//g' | xargs)
-fi
-
-if [ -f ".env" ]
-then
-  export $(cat .env | sed 's/#.*//g' | xargs)
-fi
-
-BINARY_PATH="${PWD}/../server/bin/neko"
-
-# use -r to rebuild
-if [ ! -f "${BINARY_PATH}" ] || [ "$1" == "-r" ]; then
-  ./rebuild-server
-fi
-
-# if image starts with nvidia- add --gpus all
-if [[ "${SERVER_TAG}" == "nvidia-"* ]]; then
-  GPU_FLAG="--gpus all"
-  echo "Nvidia GPU acceleration enabled"
-fi
-
-# if image starts with intel- add --device /dev/dri
-if [[ "${SERVER_TAG}" == "intel-"* ]]; then
-  GPU_FLAG="--device /dev/dri"
-  echo "Intel GPU acceleration enabled"
-fi
-
-# use --gpus all to enable GPU acceleration
-docker run --rm -it \
-  --name "neko_dev" \
-  $GPU_FLAG \
-  -p "${SERVER_PORT}:8080" \
-  -p "${SERVER_EPR}:${SERVER_EPR}/udp" \
-  -e "NEKO_SCREEN=1920x1080@60" \
-  -e "NEKO_EPR=${SERVER_EPR}" \
-  -e "NEKO_NAT1TO1=${SERVER_IP}" \
-  -e "NEKO_ICELITE=true" \
-  -e "NEKO_MAX_FPS=25" \
-  -v "${BINARY_PATH}:/usr/bin/neko" \
-  --shm-size=2G \
-  --cap-add SYS_ADMIN \
-  ${BUILD_IMAGE}:${SERVER_TAG}

.editorconfig

@@ -6,4 +6,4 @@ indent_style = space
 indent_size = 2
 end_of_line = lf
 insert_final_newline = true
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true

.gitattributes

@@ -19,4 +19,4 @@
 *.ico binary
 *.mov binary
 *.mp4 binary
-*.mp3 binary
+*.mp3 binary

.github/workflows/client_build.yml

@@ -0,0 +1,45 @@
+name: Build Client
+
+on:
+  workflow_call:
+    inputs:
+      with-artifact:
+        required: false
+        type: boolean
+        default: true
+        description: |
+          If true, the build artifacts will be uploaded as a GitHub Actions artifact.
+          This is useful for debugging and testing purposes. If false, the artifacts
+          will not be uploaded. This is useful for test builds where you don't need
+          the artifacts.
+
+jobs:
+  build-client:
+    name: Build Client
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+          cache-dependency-path: client/package-lock.json
+
+      - name: Install dependencies
+        working-directory: ./client
+        run: npm ci
+
+      - name: Build client
+        working-directory: ./client
+        run: npm run build
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        if: ${{ inputs.with-artifact }}
+        with:
+          name: client
+          path: client/dist

.github/workflows/client_test.yml

@@ -0,0 +1,19 @@
+name: Test Client
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - client/**
+      - .github/workflows/client_build.yml
+      - .github/workflows/client_test.yml
+
+jobs:
+  test-client:
+    name: Test Client
+    uses: ./.github/workflows/client_build.yml
+    with:
+      # Do not upload artifacts for test builds
+      with-artifact: false
+    secrets: inherit

.github/workflows/dockerhub.yml

@@ -1,8 +1,11 @@
-name: "build and push amd64 images to Docker Hub"
+name: Build and Push to Docker Hub
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+    paths-ignore:
+      - 'webpage/**'
   #
   # Run this action periodically to keep browsers up-to-date
   # even if there is no activity in this repo.
@@ -10,69 +13,119 @@ on:
   schedule:
     - cron: "43 2 * * 1"
 
+# allow only one workflow to run at a time
+# and cancel in-progress jobs if a new one is triggered
+concurrency:
+  group: "dockerhub"
+  cancel-in-progress: true
+
 env:
   DOCKER_IMAGE: m1k1o/neko
 
 jobs:
   build-base:
+    name: Base Image
     runs-on: ubuntu-latest
     #
     # do not run on forks
     #
     if: github.repository_owner == 'm1k1o'
     steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata (tags, labels) for Docker
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=raw,value=base
 
       - name: Login to Docker Hub
-        run: |
-          docker login --username "${DOCKER_USERNAME}" --password-stdin "${DOCKER_REGISTRY}" <<< "${DOCKER_TOKEN}"
-        env:
-          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build base
-        run: |
-          BUILD_IMAGE=${DOCKER_IMAGE} .docker/build ${DOCKER_TAG}
-          docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
-        env:
-          DOCKER_TAG: base
+      - name: Generate base Dockerfile
+        run: go run utils/docker/main.go -i Dockerfile.tmpl -o Dockerfile
 
-  build:
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-app:
+    name: App Image
     runs-on: ubuntu-latest
     #
     # do not run on forks
     #
     if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
+    needs: build-base
     strategy:
       # Will build all images even if some fail.
       fail-fast: false
       matrix:
-        tags: [ firefox, chromium, google-chrome, ungoogled-chromium, microsoft-edge, brave, vivaldi, opera, tor-browser, remmina, vlc, xfce, kde ]
-    env:
-      DOCKER_TAG: ${{ matrix.tags }}
+        tag: 
+          - firefox
+          # Temporarily disabled due to Cloudflare blocked download link
+          #- waterfox
+          - chromium
+          - google-chrome
+          - ungoogled-chromium
+          - microsoft-edge
+          - brave
+          - vivaldi
+          - opera
+          - tor-browser
+          - remmina
+          - vlc
+          - xfce
+          - kde
     steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata (tags, labels) for Docker
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ${{ env.DOCKER_IMAGE }}
+          tags: |
+            type=raw,value=latest,enable=${{ matrix.tag == 'firefox' }}
+            type=raw,value=${{ matrix.tag }}
 
       - name: Login to Docker Hub
-        run: |
-          docker login --username "${DOCKER_USERNAME}" --password-stdin "${DOCKER_REGISTRY}" <<< "${DOCKER_TOKEN}"
-        env:
-          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build container
-        run: |
-          BUILD_IMAGE=${DOCKER_IMAGE} .docker/build ${DOCKER_TAG}
-          docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
-
-      - name: Push latest tag
-        if: ${{ matrix.tags == 'firefox' }}
-        run: |
-          docker pull ${DOCKER_IMAGE}:${DOCKER_TAG}
-          docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
-          docker push ${DOCKER_IMAGE}:latest
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: apps/${{ matrix.tag }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=${{ env.DOCKER_IMAGE }}:base
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/ghcr-amd.yml

@@ -1,125 +0,0 @@
-name: "amd64 images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: m1k1o/neko
-  TAG_PREFIX: ""
-  BASE_DOCKERFILE: Dockerfile
-  PLATFORMS: linux/amd64
-
-jobs:
-  build-base:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
-    strategy:
-      # Will build all images even if some fail.
-      matrix:
-        include:
-          - tag: firefox
-          - tag: chromium
-          - tag: google-chrome
-          - tag: ungoogled-chromium
-          - tag: microsoft-edge
-          - tag: brave
-          - tag: vivaldi
-          - tag: opera
-          - tag: tor-browser
-          - tag: remmina
-          - tag: vlc
-          - tag: xfce
-          - tag: kde
-    env:
-      TAG_NAME: ${{ matrix.tag }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}${{ env.TAG_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .docker/${{ env.TAG_NAME }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base:sha-${{ github.sha }}

.github/workflows/ghcr-arm.yml

@@ -1,126 +0,0 @@
-name: "arm64v8 and arm32v7 images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: m1k1o/neko
-  TAG_PREFIX: arm-
-  BASE_DOCKERFILE: Dockerfile.arm
-  PLATFORMS: linux/arm64,linux/arm/v7
-
-jobs:
-  build-base:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
-    strategy:
-      # Will build all images even if some fail.
-      matrix:
-        include:
-          - tag: firefox
-            dockerfile: Dockerfile.arm
-          - tag: chromium
-            dockerfile: Dockerfile.arm
-          - tag: ungoogled-chromium
-            dockerfile: Dockerfile
-          - tag: tor-browser
-            dockerfile: Dockerfile
-          - tag: vlc
-            dockerfile: Dockerfile
-          - tag: xfce
-            dockerfile: Dockerfile
-    env:
-      TAG_NAME: ${{ matrix.tag }}
-      DOCKERFILE: ${{ matrix.dockerfile }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}${{ env.TAG_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .docker/${{ env.TAG_NAME }}
-          file: .docker/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base:sha-${{ github.sha }}

.github/workflows/ghcr-intel.yml

@@ -1,126 +0,0 @@
-name: "intel gpu supported images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: m1k1o/neko
-  TAG_PREFIX: intel-
-  BASE_DOCKERFILE: Dockerfile.intel
-  PLATFORMS: linux/amd64
-
-jobs:
-  build-base:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
-    strategy:
-      # Will build all images even if some fail.
-      matrix:
-        include:
-          - tag: firefox
-          - tag: chromium
-          - tag: google-chrome
-          - tag: ungoogled-chromium
-          - tag: microsoft-edge
-          - tag: brave
-          - tag: vivaldi
-          - tag: opera
-          - tag: tor-browser
-          - tag: remmina
-          - tag: vlc
-          - tag: xfce
-          - tag: kde
-    env:
-      TAG_NAME: ${{ matrix.tag }}
-      DOCKERFILE: ${{ matrix.dockerfile }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}${{ env.TAG_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .docker/${{ env.TAG_NAME }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base:sha-${{ github.sha }}

.github/workflows/ghcr-nvidia.yml

@@ -1,122 +0,0 @@
-name: "nvidia gpu supported images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: m1k1o/neko
-  TAG_PREFIX: nvidia-
-  BASE_DOCKERFILE: Dockerfile.nvidia
-  PLATFORMS: linux/amd64
-
-jobs:
-  build-base:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
-    strategy:
-      # Will build all images even if some fail.
-      matrix:
-        include:
-          - tag: brave
-            dockerfile: Dockerfile.nvidia
-          - tag: chromium
-            dockerfile: Dockerfile.nvidia
-          - tag: google-chrome
-            dockerfile: Dockerfile.nvidia
-          - tag: microsoft-edge
-            dockerfile: Dockerfile.nvidia
-    env:
-      TAG_NAME: ${{ matrix.tag }}
-      DOCKERFILE: ${{ matrix.dockerfile }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}${{ env.TAG_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .docker/${{ env.TAG_NAME }}
-          file: .docker/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base:sha-${{ github.sha }}

.github/workflows/ghcr.yml

@@ -0,0 +1,57 @@
+name: Build and Push to GHCR
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-base:
+    name: Base Image
+    uses: ./.github/workflows/image_base.yml
+    with:
+      platforms: linux/amd64,linux/arm64,linux/arm/v7
+    secrets: inherit
+
+  build-app:
+    name: App Image
+    uses: ./.github/workflows/image_app.yml
+    needs: build-base
+    strategy:
+      # Will build all images even if some fail.
+      fail-fast: false
+      matrix:
+        include:
+          - name: firefox
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # Temporarily disabled due to Cloudflare blocked download link
+          #- name: waterfox
+          #  platforms: linux/amd64
+          - name: chromium
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - name: google-chrome
+            platforms: linux/amd64
+          - name: ungoogled-chromium
+            platforms: linux/amd64
+          - name: microsoft-edge
+            platforms: linux/amd64
+          - name: brave
+            platforms: linux/amd64,linux/arm64
+          - name: vivaldi
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - name: opera
+            platforms: linux/amd64
+          - name: tor-browser
+            platforms: linux/amd64
+          - name: remmina
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - name: vlc
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - name: xfce
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - name: kde
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+    with:
+      name: ${{ matrix.name }}
+      platforms: ${{ matrix.platforms }}
+    secrets: inherit

.github/workflows/ghcr_intel.yml

@@ -0,0 +1,47 @@
+name: Build and Push to GHCR for Intel
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-base:
+    name: Base Image
+    uses: ./.github/workflows/image_base.yml
+    with:
+      flavor: intel
+      platforms: linux/amd64
+      dockerfile: Dockerfile.intel
+    secrets: inherit
+
+  build-app:
+    name: App Image
+    uses: ./.github/workflows/image_app.yml
+    needs: build-base
+    strategy:
+      # Will build all images even if some fail.
+      fail-fast: false
+      matrix:
+        include:
+          - name: firefox
+          # Temporarily disabled due to Cloudflare blocked download link
+          #- name: waterfox
+          - name: chromium
+          - name: google-chrome
+          - name: ungoogled-chromium
+          - name: microsoft-edge
+          - name: brave
+          - name: vivaldi
+          - name: opera
+          - name: tor-browser
+          - name: remmina
+          - name: vlc
+          - name: xfce
+          - name: kde
+    with:
+      name: ${{ matrix.name }}
+      flavor: intel
+      platforms: ${{ matrix.platforms }}
+      dockerfile: ${{ matrix.dockerfile }}
+    secrets: inherit

.github/workflows/ghcr_nvidia.yml

@@ -0,0 +1,42 @@
+name: Build and Push to GHCR for Nvidia
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-base:
+    name: Base Image
+    uses: ./.github/workflows/image_base.yml
+    with:
+      flavor: nvidia
+      platforms: linux/amd64
+      dockerfile: Dockerfile.nvidia
+    secrets: inherit
+
+  build-app:
+    name: App Image
+    uses: ./.github/workflows/image_app.yml
+    needs: build-base
+    strategy:
+      # Will build all images even if some fail.
+      fail-fast: false
+      matrix:
+        include:
+          - name: firefox
+            dockerfile: Dockerfile.nvidia
+          - name: brave
+            dockerfile: Dockerfile.nvidia
+          - name: chromium
+            dockerfile: Dockerfile.nvidia
+          - name: google-chrome
+            dockerfile: Dockerfile.nvidia
+          - name: microsoft-edge
+            dockerfile: Dockerfile.nvidia
+    with:
+      name: ${{ matrix.name }}
+      flavor: nvidia
+      platforms: ${{ matrix.platforms }}
+      dockerfile: ${{ matrix.dockerfile }}
+    secrets: inherit

.github/workflows/image_app.yml

@@ -0,0 +1,76 @@
+name: Build App Image
+
+on:
+  workflow_call:
+    inputs:
+      name:
+        required: true
+        type: string
+        description: "The name of the app to build."
+      flavor:
+        required: false
+        type: string
+        default: ""
+        description: "The flavor of the image to build."
+      platforms:
+        required: false
+        type: string
+        default: "linux/amd64"
+        description: "The platforms to build for."
+      dockerfile:
+        required: false
+        type: string
+        default: "Dockerfile"
+        description: "The Dockerfile to use for building the image."
+
+env:
+  FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}
+
+jobs:
+  build-app:
+    name: Build App Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata (tags, labels) for Docker
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ghcr.io/${{ github.repository }}/${{ env.FLAVOR_PREFIX }}${{ inputs.name }}
+          tags: |
+            type=edge,branch=master
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha,format=long
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: apps/${{ inputs.name }}
+          file: apps/${{ inputs.name }}/${{ inputs.dockerfile || 'Dockerfile' }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository }}/${{ env.FLAVOR_PREFIX }}base:sha-${{ github.sha }}
+          platforms: ${{ inputs.platforms || 'linux/amd64' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/image_base.yml

@@ -0,0 +1,85 @@
+name: Build Base Image
+
+on:
+  workflow_call:
+    inputs:
+      flavor:
+        required: false
+        type: string
+        default: ""
+        description: "The flavor of the image to build. This is used to determine the base image and the Dockerfile to use."
+      platforms:
+        required: false
+        type: string
+        default: "linux/amd64"
+        description: "The platforms to build for."
+      dockerfile:
+        required: false
+        type: string
+        default: "Dockerfile"
+        description: "The Dockerfile to use for building the image."
+
+env:
+  FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}
+
+jobs:
+  build-client:
+    name: Build Client Artifacts
+    uses: ./.github/workflows/client_build.yml
+
+  build-base:
+    name: Build Base Image
+    runs-on: ubuntu-latest
+    needs: build-client
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download client dist
+        uses: actions/download-artifact@v4
+        with:
+          name: client
+          path: client/dist
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata (tags, labels) for Docker
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ghcr.io/${{ github.repository }}/${{ env.FLAVOR_PREFIX }}base
+          tags: |
+            type=edge,branch=master
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha,format=long
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+
+      - name: Generate base Dockerfile
+        env:
+          RUNTIME_DOCKERFILE: ${{ inputs.dockerfile || 'Dockerfile' }}
+        run: go run utils/docker/main.go -i Dockerfile.tmpl -o Dockerfile -client client/dist
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: ${{ inputs.platforms || 'linux/amd64' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/server_test.yml

@@ -0,0 +1,44 @@
+name: Test Server
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - server/**
+      - .github/workflows/server_test.yml
+
+jobs:
+  build-amd64:
+    name: Build amd64
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./server
+          platforms: linux/amd64
+
+  build-arm64:
+    name: Build arm64
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./server
+          platforms: linux/arm64

.github/workflows/webpage_build.yml

@@ -0,0 +1,45 @@
+name: Build Webpage
+
+on:
+  workflow_call:
+    inputs:
+      with-artifact:
+        required: false
+        type: boolean
+        default: true
+        description: |
+          If true, the build artifacts will be uploaded as a GitHub Actions artifact.
+          This is useful for debugging and testing purposes. If false, the artifacts
+          will not be uploaded. This is useful for test builds where you don't need
+          the artifacts.
+
+jobs:
+  build-webpage:
+    name: Build Webpage
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+          cache-dependency-path: webpage/package-lock.json
+
+      - name: Install dependencies
+        working-directory: ./webpage
+        run: npm ci
+
+      - name: Build webpage
+        working-directory: ./webpage
+        run: npm run build
+
+      - if: ${{ inputs.with-artifact }}
+        name: Upload artifacts
+        uses: actions/upload-pages-artifact@v3
+        with:
+          artifact-name: github-pages
+          path: ./webpage/build

.github/workflows/webpage_deploy.yml

@@ -0,0 +1,47 @@
+name: Build and Deploy Webpage to GitHub Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches:
+      - master
+    paths:
+      - webpage/**
+      - .github/workflows/webpage_build.yml
+      - .github/workflows/webpage_deploy.yml
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build-webpage:
+    name: Build Webpage
+    uses: ./.github/workflows/webpage_build.yml
+    secrets: inherit
+
+  deploy-webpage:
+    name: Deploy to GitHub Pages
+    needs: build-webpage
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/webpage_test.yml

@@ -0,0 +1,19 @@
+name: Test Webpage
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - webpage/**
+      - .github/workflows/webpage_build.yml
+      - .github/workflows/webpage_test.yml
+
+jobs:
+  test-webpage:
+    name: Test Webpage
+    uses: ./.github/workflows/webpage_build.yml
+    with:
+      # Do not upload artifacts for test builds
+      with-artifact: false
+    secrets: inherit

.gitignore

@@ -33,3 +33,16 @@ bin
 
 # Environment files
 *.env
+.env.development
+
+# Code Editors
+.idea
+
+runtime/fonts/*
+!runtime/fonts/.gitkeep
+
+runtime/icon-theme/*
+!runtime/icon-theme/.gitkeep
+
+# root Dockerfile is generated from the Dockerfile.tmpl
+/Dockerfile

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "launch",
+            "type": "go",
+            "debugAdapter": "dlv-dap",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}/server/cmd/neko",
+            "output": "${workspaceFolder}/server/bin/debug/neko",
+            "cwd": "${workspaceFolder}/server/",
+            "args": ["serve", "-d", "-c", "dev/runtime/config.yml"],
+            "env": {
+                "DISPLAY": ":99.0",
+                "PION_LOG_TRACE": "all",
+            }
+        }
+    ]
+}

.vscode/settings.json

@@ -1 +1,13 @@
-{}
+{
+  "go.inferGopath": false,
+  "go.autocompleteUnimportedPackages": true,
+  "go.delveConfig": {
+    "useApiV1": false
+  },
+  "[go]": {
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    }
+  }
+}

Dockerfile.tmpl

@@ -0,0 +1,17 @@
+# This Dockerfile is pre-processed by the ./utils/docker script, it is not meant to be used directly.
+
+FROM ./server/ AS server
+FROM ./client/ AS client
+FROM ./utils/xorg-deps/ AS xorg-deps
+FROM ./runtime/$RUNTIME_DOCKERFILE AS runtime
+
+# tells neko-rooms which version of the API to use
+LABEL net.m1k1o.neko.api-version=3
+
+COPY --from=server /src/bin/plugins/ /etc/neko/plugins/
+COPY --from=server /src/bin/neko /usr/bin/neko
+COPY --from=client /src/dist/ /var/www
+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 config.yml /etc/neko/neko.yaml

LICENSE

@@ -186,7 +186,10 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Nurdism <nurdism.io@gmail.com>, 2020-2021 m1k1o
+   Copyright (C) 2020 Nurdism <nurdism.io@gmail.com>
+   Copyright (C) 2020-2024 m1k1o & Demodesk GmbH
+   Copyright (C) 2024- m1k1o
+   All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +201,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <a href="https://github.com/m1k1o/neko" title="Neko's Github repository.">
-    <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/logo.png" width="400" height="auto"/>
+    <img src="https://neko.m1k1o.net/img/logo.png" width="400" height="auto"/>
   </a>
   <p align="center">
     <a href="https://github.com/m1k1o/neko/releases">
@@ -21,11 +21,14 @@
     <a href="https://discord.gg/3U6hWpC">
       <img src="https://discordapp.com/api/guilds/665851821906067466/widget.png" alt="Chat on discord">
     </a>
+    <a href="https://hellogithub.com/repository/4536d4546af24196af3f08a023dfa007" target="_blank">
+      <img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=4536d4546af24196af3f08a023dfa007&claim_uid=0x19e4dJwD83aW2&theme=small" alt="Featured｜HelloGitHub" />
+    </a>
     <a href="https://github.com/m1k1o/neko/actions">
-      <img src="https://github.com/m1k1o/neko/actions/workflows/ghcr-amd.yml/badge.svg" alt="build">
+      <img src="https://github.com/m1k1o/neko/actions/workflows/ghcr.yml/badge.svg" alt="build">
     </a>
   </p>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/intro.gif" width="650" height="auto"/>
+  <img src="https://neko.m1k1o.net/img/intro.gif" width="650" height="auto"/>
 </div>
 
 # n.eko
@@ -83,47 +86,60 @@ Compared to clientless remote desktop gateway (e.g. [Apache Guacamole](https://g
 ### Supported browsers
 
 <div align="center">
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/firefox.svg" title="m1k1o/neko:firefox" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/google-chrome.svg" title="m1k1o/neko:google-chrome" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/chromium.svg" title="m1k1o/neko:chromium" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/microsoft-edge.svg" title="m1k1o/neko:microsoft-edge" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/brave.svg" title="m1k1o/neko:brave" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/vivaldi.svg" title="m1k1o/neko:vivaldi" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/opera.svg" title="m1k1o/neko:opera" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/tor-browser.svg" title="m1k1o/neko:tor-browser" width="60" height="auto"/>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox">
+    <img src="https://neko.m1k1o.net/img/icons/firefox.svg" title="ghcr.io/m1k1o/neko/firefox" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser">
+    <img src="https://neko.m1k1o.net/img/icons/tor-browser.svg" title="ghcr.io/m1k1o/neko/tor-browser" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox">
+    <img src="https://neko.m1k1o.net/img/icons/waterfox.svg" title="ghcr.io/m1k1o/neko/waterfox" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium">
+    <img src="https://neko.m1k1o.net/img/icons/chromium.svg" title="ghcr.io/m1k1o/neko/chromium" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome">
+    <img src="https://neko.m1k1o.net/img/icons/google-chrome.svg" title="ghcr.io/m1k1o/neko/google-chrome" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium">
+    <img src="https://neko.m1k1o.net/img/icons/ungoogled-chromium.svg" title="ghcr.io/m1k1o/neko/google-chrome" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge">
+    <img src="https://neko.m1k1o.net/img/icons/microsoft-edge.svg" title="ghcr.io/m1k1o/neko/microsoft-edge" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#brave">
+    <img src="https://neko.m1k1o.net/img/icons/brave.svg" title="ghcr.io/m1k1o/neko/brave" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi">
+    <img src="https://neko.m1k1o.net/img/icons/vivaldi.svg" title="ghcr.io/m1k1o/neko/vivaldi" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#opera">
+    <img src="https://neko.m1k1o.net/img/icons/opera.svg" title="ghcr.io/m1k1o/neko/opera" width="60" height="auto"/>
+  </a>
+
+  ... see [all available images](https://neko.m1k1o.net/docs/v3/installation/docker-images)
 </div>
 
-### Other programs
+### Other applications
 
 <div align="center">
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/remmina.png" title="m1k1o/neko:remmina" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/vlc.svg" title="m1k1o/neko:vlc" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/xfce.svg" title="m1k1o/neko:xfce" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/kde.svg" title="m1k1o/neko:kde" width="60" height="auto"/>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce">
+    <img src="https://neko.m1k1o.net/img/icons/xfce.svg" title="ghcr.io/m1k1o/neko/xfce" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#kde">
+    <img src="https://neko.m1k1o.net/img/icons/kde.svg" title="ghcr.io/m1k1o/neko/kde" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina">
+    <img src="https://neko.m1k1o.net/img/icons/remmina.svg" title="ghcr.io/m1k1o/neko/remmina" width="60" height="auto"/>
+  </a>
+  <a href="https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc">
+    <img src="https://neko.m1k1o.net/img/icons/vlc.svg" title="ghcr.io/m1k1o/neko/vlc" width="60" height="auto"/>
+  </a>
 
   ... others in <a href="https://github.com/m1k1o/neko-apps">m1k1o/neko-apps</a>
 </div>
 
-### Features
-
-  * Text Chat (With basic markdown support, discord flavor)
-  * Admin users (Kick, Ban & Force Give/Release Controls, Lock room)
-  * Clipboard synchronization (on [supported browsers](https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/readText))
-  * Emote overlay
-  * Ignore user (chat and emotes)
-  * Persistent settings
-  * Automatic Login with custom url args. (add `?usr=<your-user-name>&pwd=<room-pass>` to the url.)
-  * Broadcasting room content using RTMP (to e.g. twitch or youtube...)
-  * Bidirectional file transfer (if enabled)
-
-<div align="center">
-
-With `NEKO_FILE_TRANSFER_ENABLED=true`:
-
-<img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/file-transfer.gif" width="650" height="auto"/>
-</div>
-
-### Why n.eko?
+### Why neko?
 
 I like cats 🐱 (`Neko` is the Japanese word for cat), I'm a weeb/nerd.
 
@@ -131,28 +147,26 @@ I like cats 🐱 (`Neko` is the Japanese word for cat), I'm a weeb/nerd.
 
 ## Multiple rooms
 
-For n.eko room management software, visit [neko-rooms](https://github.com/m1k1o/neko-rooms).
+For neko room management software, visit [neko-rooms](https://github.com/m1k1o/neko-rooms).
 
-It also offers zero-knowledge [installation script (with HTTPS and Traefik)](https://github.com/m1k1o/neko-rooms/#zero-knowledge-installation-with-https-and-traefik).
+It also offers [Zero-knowledge installation (with HTTPS)](https://github.com/m1k1o/neko-rooms/?tab=readme-ov-file#zero-knowledge-installation-with-https).
 
 ## Documentation
 
-* [Getting Started](https://neko.m1k1o.net/#/getting-started/)
-  * [Quick Start](https://neko.m1k1o.net/#/getting-started/quick-start)
-  * [Examples](https://neko.m1k1o.net/#/getting-started/examples)
-  * [Reverse Proxy](https://neko.m1k1o.net/#/getting-started/reverse-proxy)
-  * [Configuration](https://neko.m1k1o.net/#/getting-started/configuration)
-  * [Troubleshooting](https://neko.m1k1o.net/#/getting-started/troubleshooting)
-* [Mobile Support](https://neko.m1k1o.net/#/mobile-support)
-* [Contributing](https://neko.m1k1o.net/#/contributing)
-  * [Non Goals](https://neko.m1k1o.net/#/non-goals)
-  * [Technologies](https://neko.m1k1o.net/#/technologies)
-* [Changelog](https://neko.m1k1o.net/#/changelog)
+Full documentation is available at [neko.m1k1o.net](https://neko.m1k1o.net/). Key sections include:
 
-## How to contribute? How to build?
+- [Migration from V2](https://neko.m1k1o.net/docs/v3/migration-from-v2)
+- [Getting Started](https://neko.m1k1o.net/docs/v3/quick-start)
+- [Installation](https://neko.m1k1o.net/docs/v3/installation)
+- [Examples](https://neko.m1k1o.net/docs/v3/installation/examples)
+- [Configuration](https://neko.m1k1o.net/docs/v3/configuration)
+- [Frequently Asked Questions](https://neko.m1k1o.net/docs/v3/faq)
+- [Troubleshooting](https://neko.m1k1o.net/docs/v3/troubleshooting)
 
-Navigate to [.docker](.docker) folder for further information.
+## How to Contribute
+
+Contributions are welcome! Check the [Contributing Guide](https://neko.m1k1o.net/contributing) for details.
 
 ## Support
 
-If you want to support this project, you can do it [here](https://github.com/sponsors/m1k1o).
+If you find Neko useful, consider supporting the project via [GitHub Sponsors](https://github.com/sponsors/m1k1o).

SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If there are any vulnerabilities in **m1k1o/neko**, don't hesitate to _report them_.
+
+1. Send an email to `security@m1k1o.net`.
+
+2. Describe the vulnerability.
+
+   If you have a fix, that is most welcome -- please attach or summarize it in your message!
+
+3. We will evaluate the vulnerability and, if necessary, release a fix or mitigating steps to address it. We will contact you to let you know the outcome, and will credit you in the report.
+
+   Please **do not disclose the vulnerability publicly** until a fix is released!
+
+4. Once we have either a) published a fix, or b) declined to address the vulnerability for whatever reason, you are free to publicly disclose it.
+
+We appreciate your help in keeping Neko secure.

apps/brave/Dockerfile

@@ -1,12 +1,13 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 RUN set -eux; apt-get update; \
     apt-get install -y --no-install-recommends apt-transport-https curl openbox; \
     #
     # install brave browser
+    ARCH=$(dpkg --print-architecture); \
     curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg; \
-    echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" \
+    echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=${ARCH}] https://brave-browser-apt-release.s3.brave.com/ stable main" \
         | tee /etc/apt/sources.list.d/brave-browser-release.list; \
     apt-get update; \
     apt-get install -y --no-install-recommends brave-browser; \

apps/brave/Dockerfile.nvidia

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 RUN set -eux; apt-get update; \

apps/chromium/Dockerfile

@@ -0,0 +1,41 @@
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
+FROM $BASE_IMAGE
+
+#
+# install neko chromium
+RUN set -eux; \
+    echo "deb http://ftp.de.debian.org/debian bookworm main" >> /etc/apt/sources.list; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends chromium chromium-common chromium-sandbox openbox; \
+    #
+    # install widevine module (only for amd64)
+    CHROMIUM_DIR="/usr/lib/chromium"; \
+    ARCH=$(dpkg --print-architecture); \
+    if [ "${ARCH}" = "amd64" ]; then \
+        # https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/chromeos-lacros-arm64-squash-zstd-120.0.6098.0
+        apt-get install -y --no-install-recommends unzip; \
+        WIDEVINE_ARCH="x64"; \
+        WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
+        wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-${WIDEVINE_ARCH}.zip"; \
+        mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_${WIDEVINE_ARCH}"; \
+        unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \
+        unzip -p /tmp/widevine.zip manifest.json > "${CHROMIUM_DIR}/WidevineCdm/manifest.json"; \
+        unzip -p /tmp/widevine.zip libwidevinecdm.so > "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_${WIDEVINE_ARCH}/libwidevinecdm.so"; \
+        find "${CHROMIUM_DIR}/WidevineCdm" -type d -exec chmod 0755 '{}' \;; \
+        find "${CHROMIUM_DIR}/WidevineCdm" -type f -exec chmod 0644 '{}' \;; \
+        rm /tmp/widevine.zip; \
+        apt-get --purge autoremove -y unzip; \
+    else \
+        echo "Widevine is not supported on ${ARCH}"; \
+    fi; \
+    #
+    # clean up
+    apt-get clean -y; \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+#
+# copy configuation files
+COPY supervisord.conf /etc/neko/supervisord/chromium.conf
+COPY --chown=neko preferences.json /home/neko/.config/chromium/Default/Preferences
+COPY policies.json /etc/chromium/policies/managed/policies.json
+COPY openbox.xml /etc/neko/openbox.xml

apps/chromium/Dockerfile.nvidia

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 #
@@ -14,7 +14,7 @@ RUN set -eux; \
     #
     # install widevine module
     CHROMIUM_DIR="/usr/lib/chromium"; \
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \
+    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
     wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
     mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \
     unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \

apps/firefox/Dockerfile

@@ -0,0 +1,56 @@
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
+FROM $BASE_IMAGE
+
+#
+# install firefox
+RUN set -eux; apt-get update; \
+    apt-get install -y --no-install-recommends openbox; \
+    ARCH=$(dpkg --print-architecture); \
+    if [ "${ARCH}" = "armhf" ]; then \
+        #
+        # install firefox-esr for armhf
+        apt-get install -y --no-install-recommends firefox-esr; \
+        ln -s /usr/lib/firefox-esr /usr/lib/firefox; \
+        #
+        # install extensions
+        mkdir -p /usr/lib/firefox-esr/distribution/extensions; \
+        wget -O '/usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi' https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi; \
+        wget -O '/usr/lib/firefox-esr/distribution/extensions/sponsorBlocker@ajay.app.xpi' https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi; \
+    else \
+        #
+        # fetch latest release (for amd64 and arm64)
+        if [ "${ARCH}" = "amd64" ]; then \
+            SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"; \
+        elif [ "${ARCH}" = "arm64" ]; then \
+            SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64-aarch64&lang=en-US"; \
+        fi; \
+        if [ ! -z "${SRC_URL}" ]; then \
+            apt-get install -y --no-install-recommends xz-utils libgtk-3-0 libdbus-glib-1-2; \
+            wget -O /tmp/firefox-setup.tar.xz "${SRC_URL}"; \
+            mkdir /usr/lib/firefox; \
+            tar -xvf /tmp/firefox-setup.tar.xz -C /usr/lib; \
+            rm -f /tmp/firefox-setup.tar.xz; \
+            ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
+            apt-get --purge autoremove -y xz-utils; \
+        else \
+            echo "Unsupported architecture: ${ARCH}"; \
+            exit 1; \
+        fi; \
+    fi; \
+    #
+    # create a profile directory
+    mkdir -p /home/neko/.mozilla/firefox/profile.default/extensions; \
+    chown -R neko:neko /home/neko/.mozilla/firefox/profile.default; \
+    #
+    # clean up
+    apt-get clean -y; \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+#
+# copy configuation files
+COPY supervisord.conf /etc/neko/supervisord/firefox.conf
+COPY neko.js /usr/lib/firefox/mozilla.cfg
+COPY autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
+COPY policies.json /usr/lib/firefox/distribution/policies.json
+COPY --chown=neko profiles.ini /home/neko/.mozilla/firefox/profiles.ini
+COPY openbox.xml /etc/neko/openbox.xml

apps/firefox/Dockerfile.nvidia

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"
@@ -7,13 +7,13 @@ ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lan
 # install firefox
 RUN set -eux; apt-get update; \
     apt-get install -y --no-install-recommends openbox \
-    xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
+    xz-utils libgtk-3-0 libdbus-glib-1-2; \
     #
     # fetch latest release
-    wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
+    wget -O /tmp/firefox-setup.tar.xz "${SRC_URL}"; \
     mkdir /usr/lib/firefox; \
-    tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \
-    rm -f /tmp/firefox-setup.tar.bz2; \
+    tar -xvf /tmp/firefox-setup.tar.xz -C /usr/lib; \
+    rm -f /tmp/firefox-setup.tar.xz; \
     ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
     #
     # create a profile directory
@@ -21,13 +21,13 @@ RUN set -eux; apt-get update; \
     chown -R neko:neko /home/neko/.mozilla/firefox/profile.default; \
     #
     # clean up
-    apt-get --purge autoremove -y xz-utils bzip2; \
+    apt-get --purge autoremove -y xz-utils; \
     apt-get clean -y; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #
 # copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/firefox.conf
+COPY supervisord.nvidia.conf /etc/neko/supervisord/firefox.conf
 COPY neko.js /usr/lib/firefox/mozilla.cfg
 COPY autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
 COPY policies.json /usr/lib/firefox/distribution/policies.json

apps/firefox/neko.js

@@ -15,8 +15,8 @@ lockPref("plugins.hide_infobar_for_missing_plugin", true);
 lockPref("profile.allow_automigration", false);
 lockPref("signon.prefillForms", false);
 lockPref("signon.rememberSignons", false);
-lockPref("xpinstall.enabled", false);
-lockPref("xpinstall.whitelist.required", true);
+//lockPref("xpinstall.enabled", false);
+//lockPref("xpinstall.whitelist.required", true);
 lockPref("browser.download.manager.retention", 0);
 lockPref("browser.download.folderList",	2);
 lockPref("browser.download.forbid_open_with", true);

apps/firefox/policies.json

@@ -0,0 +1,130 @@
+{
+  "policies": {
+    "BlockAboutAddons": false,
+    "BlockAboutConfig": true,
+    "BlockAboutProfiles": true,
+    "BlockAboutSupport": true,
+    "Bookmarks": [
+      {
+        "Title": "IPLeak",
+        "URL": "https://ipleak.net/",
+        "Favicon": "https://ipleak.net/favicon.ico",
+        "Folder": "Pages",
+        "Placement": "toolbar"
+      },
+      {
+        "Title": "YouTube",
+        "URL": "https://www.youtube.com/",
+        "Favicon": "https://www.youtube.com/favicon.ico",
+        "Folder": "Pages",
+        "Placement": "toolbar"
+      },
+      {
+        "Title": "Google",
+        "URL": "https://www.google.com/",
+        "Favicon": "https://www.google.com/favicon.ico",
+        "Folder": "Pages",
+        "Placement": "toolbar"
+      }
+    ],
+    "CaptivePortal": false,
+    "DisableAppUpdate": true,
+    "DisableBuiltinPDFViewer": true,
+    "DisableDeveloperTools": false,
+    "DisableFeedbackCommands": true,
+    "DisableFirefoxAccounts": true,
+    "DisableFirefoxScreenshots": true,
+    "DisableFirefoxStudies": true,
+    "DisableForgetButton": true,
+    "DisableMasterPasswordCreation": true,
+    "DisablePocket": true,
+    "DisablePrivateBrowsing": true,
+    "DisableProfileImport": true,
+    "DisableProfileRefresh": true,
+    "DisableSafeMode": true,
+    "DisableSetDesktopBackground": true,
+    "DisableSystemAddonUpdate": true,
+    "DisableTelemetry": true,
+    "DisplayBookmarksToolbar": false,
+    "DontCheckDefaultBrowser": true,
+    "EnableTrackingProtection": {
+      "Cryptomining": true,
+      "Fingerprinting": true,
+      "Value": true
+    },
+    "ExtensionSettings": {
+      "*": {
+        "installation_mode": "blocked"
+      },
+      "sponsorBlocker@ajay.app": {
+        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi",
+        "installation_mode": "force_installed"
+      },
+      "uBlock0@raymondhill.net": {
+        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
+        "installation_mode": "force_installed"
+      }
+    },
+    "ExtensionUpdate": false,
+    "FirefoxHome": {
+      "Highlights": false,
+      "Pocket": false,
+      "Search": true,
+      "Snippets": false,
+      "TopSites": true
+    },
+    "FlashPlugin": {},
+    "HardwareAcceleration": false,
+    "Homepage": {
+      "Additional": [],
+      "StartPage": "home"
+    },
+    "NewTabPage": true,
+    "NoDefaultBookmarks": true,
+    "OfferToSaveLogins": false,
+    "OfferToSaveLoginsDefault": false,
+    "OverrideFirstRunPage": "",
+    "OverridePostUpdatePage": "",
+    "PasswordManagerEnabled": false,
+    "Permissions": {
+      "Camera": {
+        "BlockNewRequests": true
+      },
+      "Location": {
+        "BlockNewRequests": true
+      },
+      "Microphone": {
+        "BlockNewRequests": true
+      },
+      "Notifications": {
+        "BlockNewRequests": true
+      }
+    },
+    "Preferences": {
+      "browser.tabs.warnOnClose": false,
+      "browser.urlbar.suggest.bookmark": false,
+      "browser.urlbar.suggest.history": false,
+      "browser.urlbar.suggest.openpage": false,
+      "datareporting.policy.dataSubmissionPolicyBypassNotification": true,
+      "dom.disable_window_flip": true,
+      "dom.disable_window_move_resize": true,
+      "dom.event.contextmenu.enabled": true,
+      "extensions.getAddons.showPane": false,
+      "places.history.enabled": false,
+      "privacy.file_unique_origin": true,
+      "ui.key.menuAccessKeyFocuses": false,
+      "browser.tabs.allowTabDetach": false
+    },
+    "PromptForDownloadLocation": false,
+    "SanitizeOnShutdown": {
+      "Cache": true,
+      "Cookies": true,
+      "Downloads": true,
+      "FormData": true,
+      "History": true,
+      "OfflineApps": true,
+      "Sessions": true,
+      "SiteSettings": true
+    }
+  }
+}

apps/firefox/supervisord.nvidia.conf

@@ -0,0 +1,28 @@
+[program:firefox]
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
+command=/bin/entrypoint.sh /usr/bin/firefox
+  --no-remote
+  -P default
+  --display=%(ENV_DISPLAY)s
+  -setDefaultBrowser
+  -width 1280
+  -height 720
+stopsignal=INT
+autorestart=true
+priority=800
+user=%(ENV_USER)s
+stdout_logfile=/var/log/neko/firefox.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
+redirect_stderr=true
+
+[program:openbox]
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
+command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
+autorestart=true
+priority=300
+user=%(ENV_USER)s
+stdout_logfile=/var/log/neko/openbox.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
+redirect_stderr=true

apps/google-chrome/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"

apps/google-chrome/Dockerfile.nvidia

@@ -1,6 +1,10 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
+# latest working version with EGL: 111.0.5563.146, revert when resolved
+# 112.0.5615.49 fails: https://github.com/VirtualGL/virtualgl/issues/229
+# google does not provide a direct link to the deb file anymore
+# ARG SRC_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.146-1_amd64.deb"
 ARG SRC_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
 
 #

apps/kde/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #

apps/microsoft-edge/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/"
@@ -8,7 +8,7 @@ ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edg
 RUN set -eux; apt-get update; \
     #
     # fetch latest release
-    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | tail -1)"; \
+    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \
     wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \
     apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \
     #

apps/microsoft-edge/Dockerfile.nvidia

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/"
@@ -8,7 +8,7 @@ ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edg
 RUN set -eux; apt-get update; \
     #
     # fetch latest release
-    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | tail -1)"; \
+    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \
     wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \
     apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \
     #

apps/opera/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://download5.operacdn.com/pub/opera/desktop/"
@@ -9,7 +9,7 @@ ARG LIBFFMPEG_API_URL="https://api.github.com/repos/nwjs-ffmpeg-prebuilt/nwjs-ff
 RUN set -eux; apt-get update; \
     #
     # fetch latest release
-    VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | tail -1)"; \
+    VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | sort --version-sort | tail -1)"; \
     wget -O /tmp/opera.deb "${API_URL}${VERSION}/linux/opera-stable_${VERSION}_amd64.deb"; \
     apt-get install -y --no-install-recommends openbox jq unzip /tmp/opera.deb; \
     #

apps/remmina/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 # install remmina

apps/remmina/run-remmina.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+err() {
+  echo "ERROR: $*" >&2
+  exit 1
+}
+
+profile_dir="/home/neko/.local/share/remmina"
+if [[ -n "$REMMINA_PROFILE" ]]; then
+  profile=${REMMINA_PROFILE%.remmina}.remmina
+  file=${profile##/*/}
+  [[ "$file" = "$profile" ]] && profile="$profile_dir"/"$file"
+  [[ -f "$profile" ]] || err "Connection profile $profile not found"
+  echo "Running remmina with connection profile $profile"
+  exec remmina -c "$profile"
+fi
+
+if [[ ! -z "$REMMINA_URL" ]]; then
+  readarray -t arr < <( echo -n "$REMMINA_URL" | perl -pe 's|^(\w+)\:\/\/(?:([^:]+)(?::([^@]+))?@)?(.*)$|\1\n\2\n\3\n\4|' )
+  proto="${arr[0]}"
+  user="${arr[1]}"
+  pw="${arr[2]}"
+  host="${arr[3]}"
+  echo "Parsed url in 'REMMINA_URL': proto:$proto username:$user host:$host"
+
+  [[ "$proto" != "vnc" && "$proto" != "rdp" && "$proto" != "spice" ]] && err "Unsupported protocol $proto in connection url 'REMMINA_URL'"
+
+  profile="$profile_dir"/"$proto".remmina
+  remmina --set-option username="$user" --update-profile "$profile"
+  remmina --set-option password="$pw" --update-profile "$profile"
+  remmina --set-option server="$host" --update-profile "$profile"
+
+  # remmina --set-option window_maximize=1 --update-profile "$profile"
+  # remmina --set-option scale=1 --update-profile "$profile"
+
+  echo "Running remmina with URL $REMMINA_URL"
+  exec remmina -c "$profile"
+fi
+
+
+echo "Running remmina without connection profile"
+exec remmina

apps/tor-browser/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #

apps/ungoogled-chromium/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://api.github.com/repos/macchrome/linchrome/releases/latest"
@@ -21,7 +21,7 @@ RUN set -eux; apt-get update; \
     chmod 4755 /usr/lib/chromium/chrome-sandbox; \
     #
     # install widevine module
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \
+    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
     wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
     unzip -p /tmp/widevine.zip libwidevinecdm.so > /usr/lib/chromium/libwidevinecdm.so; \
     chmod 644 /usr/lib/chromium/libwidevinecdm.so; \
@@ -43,6 +43,7 @@ RUN set -eux; apt-get update; \
       EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \
       echo -e "{\n  \"external_crx\": \"${EXT_PATH}\",\n  \"external_version\": \"${EXT_VERSION}\"\n}" > "${EXTENSIONS_DIR}"/"${EXT_ID}".json; \
     done; \
+    #
     # clean up
     apt-get --purge autoremove -y xz-utils jq; \
     apt-get clean -y; \

apps/vivaldi/Dockerfile

@@ -1,17 +1,13 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
-ARG VIVALDI_VERSION="5.3.2679.34-1"
-# TODO: Get chromium version from vivaldi
-ARG CHROMIUM_VERSION="102.0.5005.72"
-
 #
 # install vivaldi
 SHELL ["/bin/bash", "-c"]
 RUN set -eux; apt-get update; \
-    wget -O /tmp/vivaldi.deb "https://downloads.vivaldi.com/stable/vivaldi-stable_${VIVALDI_VERSION}_amd64.deb"; \
+    ARCH=$(dpkg --print-architecture); \
+    wget -O /tmp/vivaldi.deb "https://downloads.vivaldi.com/stable/vivaldi-stable_${ARCH}.deb"; \
     apt-get install -y --no-install-recommends wget unzip xz-utils jq openbox /tmp/vivaldi.deb; \
-    /opt/vivaldi/update-ffmpeg; \
     #
     # install latest version of uBlock Origin and SponsorBlock for YouTube
     EXTENSIONS_DIR="/usr/share/chromium/extensions"; \
@@ -22,7 +18,7 @@ RUN set -eux; apt-get update; \
     mkdir -p "${EXTENSIONS_DIR}"; \
     for EXT_ID in "${EXTENSIONS[@]}"; \
     do \
-      EXT_URL="https://clients2.google.com/service/update2/crx?response=redirect&nacl_arch=x86-64&prodversion=${CHROMIUM_VERSION}&acceptformat=crx2,crx3&x=id%3D${EXT_ID}%26installsource%3Dondemand%26uc"; \
+      EXT_URL="https://clients2.google.com/service/update2/crx?response=redirect&prodversion=100&acceptformat=crx2,crx3&x=id%3D${EXT_ID}%26installsource%3Dondemand%26uc"; \
       EXT_PATH="${EXTENSIONS_DIR}/${EXT_ID}.crx"; \
       wget -O "${EXT_PATH}" "${EXT_URL}"; \
       EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \