Initial VNC support

2026-01-23 12:04:17 +01:00 · 2023-01-02 23:20:23 +00:00
parent 57ac48b296
commit bdc689faa7
12 changed files with 295 additions and 43 deletions
--- a/scripts/dockerfiles/Git_Actions-Dockerfile
+++ b/scripts/dockerfiles/Git_Actions-Dockerfile
@@ -1,9 +1,7 @@
 ARG BASE_IMAGE=none
-
-FROM $BASE_IMAGE
-
 ARG BASE_IMAGE
 ARG BUILD_DATE
+ARG PLATFORM
 ARG IMAGE_VERSION
 ARG IMAGE_TYPE
 ARG TACHIDESK_GIT_COMMIT
@@ -12,16 +10,21 @@ ARG TACHIDESK_FILENAME
 ARG TACHIDESK_RELEASE_DOWNLOAD_URL
 ARG TACHIDESK_DOCKER_GIT_COMMIT
 ARG STARTUP_SCRIPT_URL
+ARG SUPERVISORD_URL
+ARG SUPERVISORD_TACHIDESK_URL
+ARG SUPERVISORD_WEBSOCKIFY_URL
+ARG SUPERVISORD_X11VNC_URL
+ARG SUPERVISORD_XVFB_URL

-RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi; \
-    elif echo "$BASE_IMAGE" | grep -q "eclipse-temurin"; then \
-        if echo "$BASE_IMAGE" | grep -q "alpine"; then \
-            apk --update add curl tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
-        else \
-            groupadd --gid 1000 suwayomi && useradd  --uid 1000 --gid suwayomi --no-log-init suwayomi; fi; \
-    elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
-    else echo "wrong base image"; \
-    fi
+FROM $BASE_IMAGE as base
+
+FROM base as branch-base-alpine
+RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi;
+
+FROM base as branch-base-ubuntu
+RUN groupadd --gid 1000 suwayomi && useradd  --uid 1000 --gid suwayomi --no-log-init suwayomi;
+
+FROM branch-base-${PLATFORM} AS home

 LABEL maintainer="suwayomi" \
      org.opencontainers.image.title="Tachidesk Docker" \
@@ -34,6 +37,7 @@ LABEL maintainer="suwayomi" \
      org.opencontainers.image.created=$BUILD_DATE \	  
      org.opencontainers.image.version=$IMAGE_VERSION \
      image_type=$IMAGE_TYPE \
+      platform=$PLATFORM \
      "tachidesk.git_commit"=$TACHIDESK_GIT_COMMIT \
      "tachidesk.release_tag"=$TACHIDESK_RELEASE_TAG \
      "tachidesk.filename"=$TACHIDESK_FILENAME \
@@ -41,6 +45,15 @@ LABEL maintainer="suwayomi" \
      org.opencontainers.image.licenses="MPL-2.0"

 RUN mkdir -p /home/suwayomi && chown -R suwayomi:suwayomi /home/suwayomi
+
+FROM home as branch-home-alpine
+
+FROM home as branch-home-ubuntu
+RUN mkdir -p /Xauthority && chown -R suwayomi:suwayomi /Xauthority
+VOLUME /Xauthority
+
+FROM branch-home-${PLATFORM} AS display
+
 USER suwayomi:suwayomi
 WORKDIR /home/suwayomi
 RUN echo $TACHIDESK_FILENAME
@@ -48,5 +61,25 @@ RUN curl -s --create-dirs -L $TACHIDESK_RELEASE_DOWNLOAD_URL -o /home/suwayomi/s
 RUN echo $TACHIDESK_DOCKER_GIT_COMMIT
 RUN curl -s --create-dirs -L $STARTUP_SCRIPT_URL -o /home/suwayomi/startup/startup_script.sh

+FROM display as branch-display-alpine
+EXPOSE 4567
+
+FROM display as branch-display-ubuntu
+RUN curl -s --create-dirs -L $SUPERVISORD_URL -o /home/suwayomi/startup/supervisord.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_TACHIDESK_URL -o /home/suwayomi/startup/conf.d/tachidesk.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_WEBSOCKIFY_URL -o /home/suwayomi/startup/conf.d/websockify.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_X11VNC_URL -o /home/suwayomi/startup/conf.d/x11vnc.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_XVFB_URL -o /home/suwayomi/startup/conf.d/xvfb.conf
+# start x11vnc and expose its port
+ENV DISPLAY :0.0
+# vnv server
+EXPOSE 5900
+# novnc
+EXPOSE 5800
+# Tachidesk
+EXPOSE 4567
+
+FROM branch-display-${PLATFORM} AS final
+
 EXPOSE 4567
 CMD ["/bin/sh", "/home/suwayomi/startup/startup_script.sh"]
--- a/scripts/dockerfiles/Test_Git_Actions-Dockerfile
+++ b/scripts/dockerfiles/Test_Git_Actions-Dockerfile
@@ -1,9 +1,7 @@
 ARG BASE_IMAGE=none
-
-FROM $BASE_IMAGE
-
 ARG BASE_IMAGE
 ARG BUILD_DATE
+ARG PLATFORM
 ARG IMAGE_VERSION
 ARG IMAGE_TYPE
 ARG TACHIDESK_GIT_COMMIT
@@ -12,16 +10,21 @@ ARG TACHIDESK_FILENAME
 ARG TACHIDESK_RELEASE_DOWNLOAD_URL
 ARG TACHIDESK_DOCKER_GIT_COMMIT
 ARG STARTUP_SCRIPT_URL
+ARG SUPERVISORD_URL
+ARG SUPERVISORD_TACHIDESK_URL
+ARG SUPERVISORD_WEBSOCKIFY_URL
+ARG SUPERVISORD_X11VNC_URL
+ARG SUPERVISORD_XVFB_URL

-RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi; \
-    elif echo "$BASE_IMAGE" | grep -q "eclipse-temurin"; then \
-        if echo "$BASE_IMAGE" | grep -q "alpine"; then \
-            apk --update add curl tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
-        else \
-            groupadd --gid 1000 suwayomi && useradd  --uid 1000 --gid suwayomi --no-log-init suwayomi; fi; \
-    elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
-    else echo "wrong base image"; \
-    fi
+FROM $BASE_IMAGE as base
+
+FROM base as branch-base-alpine
+RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi;
+
+FROM base as branch-base-ubuntu
+RUN groupadd --gid 1000 suwayomi && useradd  --uid 1000 --gid suwayomi --no-log-init suwayomi;
+
+FROM branch-base-${PLATFORM} AS home

 LABEL maintainer="suwayomi" \
      org.opencontainers.image.title="Tachidesk Docker" \
@@ -34,6 +37,7 @@ LABEL maintainer="suwayomi" \
      org.opencontainers.image.created=$BUILD_DATE \	  
      org.opencontainers.image.version=$IMAGE_VERSION \
      image_type=$IMAGE_TYPE \
+      platform=$PLATFORM \
      "tachidesk.git_commit"=$TACHIDESK_GIT_COMMIT \
      "tachidesk.release_tag"=$TACHIDESK_RELEASE_TAG \
      "tachidesk.filename"=$TACHIDESK_FILENAME \
@@ -48,6 +52,14 @@ RUN USER=suwayomi && \
    mkdir -p /etc/fixuid && \
    printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml

+FROM home as branch-home-alpine
+
+FROM home as branch-home-ubuntu
+RUN mkdir -p /Xauthority && chown -R suwayomi:suwayomi /Xauthority
+VOLUME /Xauthority
+
+FROM branch-home-${PLATFORM} AS display
+
 USER suwayomi:suwayomi
 WORKDIR /home/suwayomi
 RUN echo $TACHIDESK_FILENAME
@@ -55,6 +67,24 @@ RUN curl -s --create-dirs -L $TACHIDESK_RELEASE_DOWNLOAD_URL -o /home/suwayomi/s
 RUN echo $TACHIDESK_DOCKER_GIT_COMMIT
 RUN curl -s --create-dirs -L $STARTUP_SCRIPT_URL -o /home/suwayomi/startup/startup_script.sh

+FROM display as branch-display-alpine
 EXPOSE 4567
+
+FROM display as branch-display-ubuntu
+RUN curl -s --create-dirs -L $SUPERVISORD_URL -o /home/suwayomi/startup/supervisord.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_TACHIDESK_URL -o /home/suwayomi/startup/conf.d/tachidesk.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_WEBSOCKIFY_URL -o /home/suwayomi/startup/conf.d/websockify.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_X11VNC_URL -o /home/suwayomi/startup/conf.d/x11vnc.conf
+RUN curl -s --create-dirs -L $SUPERVISORD_XVFB_URL -o /home/suwayomi/startup/conf.d/xvfb.conf
+# start x11vnc and expose its port
+ENV DISPLAY :0.0
+# vnv server
+EXPOSE 5900
+# novnc
+EXPOSE 5800
+# Tachidesk
+EXPOSE 4567
+
+FROM branch-display-${PLATFORM} AS final
 ENTRYPOINT ["fixuid"]
 CMD ["/bin/sh", "/home/suwayomi/startup/startup_script.sh"]
--- a/scripts/startup_script.sh
+++ b/scripts/startup_script.sh
@@ -3,6 +3,31 @@ if [ ! -f /home/suwayomi/.local/share/Tachidesk/docker_touchfile ]; then
 	touch /home/suwayomi/.local/share/Tachidesk/docker_touchfile
 	curl -s --create-dirs -L https://raw.githubusercontent.com/Suwayomi/docker-tachidesk/main/server.conf -o /home/suwayomi/.local/share/Tachidesk/server.conf;
 fi
+
+if [ -z "$VNC_PASSWORD" ]; then
+	echo >&2 'warn: No password for VNC connection set, defaulting to "password".'
+	echo >&2 '  Did you forget to add -e VNC_PASSWORD=... ?'
+	export VNC_PASSWORD='password'
+fi
+
+if [ -z "$XFB_SCREEN" ]; then
+	export XFB_SCREEN=1024x768x24
+fi
+
+if [ ! -z "$XFB_SCREEN_DPI" ]; then
+	export DPI_OPTIONS="-dpi $XFB_SCREEN_DPI"
+else
+    export DPI_OPTIONS=""
+fi
+
+# first we need our security cookie and add it to user's .Xauthority
+mcookie | sed -e 's/^/add :0 MIT-MAGIC-COOKIE-1 /' | xauth -q
+
+# now place the security cookie with FamilyWild on volume so client can use it
+# see http://stackoverflow.com/25280523 for details on the following command
+xauth nlist :0 | sed -e 's/^..../ffff/' | xauth -f /Xauthority/xserver.xauth nmerge -
+
+
 echo ""
 echo ""
 echo "                                                                ************README***********"
@@ -15,8 +40,10 @@ echo "Tachidesk data location inside the container -> /home/suwayomi/.local/shar
 echo ""
 echo "The server is running by default configuration on  http://localhost:4567"
 if [ "${LOGGING:-file}" != "file" ]; then
-  exec java -jar "/home/suwayomi/startup/tachidesk_latest.jar";
+  export TACHIDESK_SDOUT="/dev/fd/1"
 else
  echo "log file location inside the container -> /home/suwayomi/.local/share/Tachidesk/logfile.log"
-  exec java -jar "/home/suwayomi/startup/tachidesk_latest.jar" > /home/suwayomi/.local/share/Tachidesk/logfile.log 2>&1;
+  export TACHIDESK_SDOUT="/home/suwayomi/.local/share/Tachidesk/logfile.log"
 fi
+
+exec supervisord -c /home/suwayomi/startup/supervisord.conf
--- a/scripts/startup_script_alpine.sh
+++ b/scripts/startup_script_alpine.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+if [ ! -f /home/suwayomi/.local/share/Tachidesk/docker_touchfile ]; then
+	touch /home/suwayomi/.local/share/Tachidesk/docker_touchfile
+	curl -s --create-dirs -L https://raw.githubusercontent.com/Suwayomi/docker-tachidesk/main/server.conf -o /home/suwayomi/.local/share/Tachidesk/server.conf;
+fi
+echo ""
+echo ""
+echo "                                                                ************README***********"
+echo "-> It is essential that u read readme for ghcr.io/suwayomi/tachidesk before running this container"
+echo "-> Readme for ghcr.io/suwayomi/tachidesk is available at https://github.com/suwayomi/docker-tachidesk "
+echo "                                                                *****************************"
+echo ""
+echo ""
+echo "Tachidesk data location inside the container -> /home/suwayomi/.local/share/Tachidesk"
+echo ""
+echo "The server is running by default configuration on  http://localhost:4567"
+if [ "${LOGGING:-file}" != "file" ]; then
+  exec java -jar "/home/suwayomi/startup/tachidesk_latest.jar";
+else
+  echo "log file location inside the container -> /home/suwayomi/.local/share/Tachidesk/logfile.log"
+  exec java -jar "/home/suwayomi/startup/tachidesk_latest.jar" > /home/suwayomi/.local/share/Tachidesk/logfile.log 2>&1;
+fi