diff --git a/Dockerfile b/Dockerfile index 3ae0173..fc6a9ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN \ https://github.com/selkies-project/selkies.git \ /src && \ cd /src && \ - git checkout -f 5e8079aaea2d2c4da2a0ffc477dfd0f2622cb2a7 + git checkout -f 415b376dac066ff27b3e5b22a6c32638bda059da RUN \ echo "**** build frontend ****" && \ @@ -159,7 +159,7 @@ RUN \ echo "**** install selkies ****" && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/5e8079aaea2d2c4da2a0ffc477dfd0f2622cb2a7.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/415b376dac066ff27b3e5b22a6c32638bda059da.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 450a5dc..0715ad7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,7 +15,7 @@ RUN \ https://github.com/selkies-project/selkies.git \ /src && \ cd /src && \ - git checkout -f 5e8079aaea2d2c4da2a0ffc477dfd0f2622cb2a7 + git checkout -f 415b376dac066ff27b3e5b22a6c32638bda059da RUN \ echo "**** build frontend ****" && \ @@ -157,7 +157,7 @@ RUN \ echo "**** install selkies ****" && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/5e8079aaea2d2c4da2a0ffc477dfd0f2622cb2a7.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/415b376dac066ff27b3e5b22a6c32638bda059da.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run index 2293094..146a3d2 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run @@ -59,15 +59,6 @@ fi # set env based on vars -printf "${GST_DEBUG:-*:1}" > /run/s6/container_environment/GST_DEBUG -printf "${SELKIES_ENCODER:-x264enc}" > /run/s6/container_environment/SELKIES_ENCODER -printf "${SELKIES_FRAMERATE:-60}" > /run/s6/container_environment/SELKIES_FRAMERATE -printf "${SELKIES_ENABLE_RESIZE:-true}" > /run/s6/container_environment/SELKIES_ENABLE_RESIZE -printf "${DISPLAY_SIZEW:-1024}" > /run/s6/container_environment/DISPLAY_SIZEW -printf "${DISPLAY_SIZEH:-768}" > /run/s6/container_environment/DISPLAY_SIZEH -printf "${DISPLAY_REFRESH:60}" > /run/s6/container_environment/DISPLAY_REFRESH -printf "${DISPLAY_DPI:-96}" > /run/s6/container_environment/DISPLAY_DPI -printf "${DISPLAY_CDEPTH:-24}" > /run/s6/container_environment/DISPLAY_CDEPTH if [[ -z ${NO_GAMEPAD+x} ]]; then printf "/usr/lib/selkies_joystick_interposer.so:/opt/lib/libudev.so.1.0.0-fake" > /run/s6/container_environment/LD_PRELOAD fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xorg/run b/root/etc/s6-overlay/s6-rc.d/svc-xorg/run index fd2ec29..200653d 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-xorg/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-xorg/run @@ -9,8 +9,8 @@ fi exec s6-setuidgid abc \ /usr/bin/Xvfb \ "${DISPLAY}" \ - -screen 0 "${DEFAULT_RES}x${DISPLAY_CDEPTH}" \ - -dpi "${DISPLAY_DPI}" \ + -screen 0 "${DEFAULT_RES}x24" \ + -dpi "96" \ +extension "COMPOSITE" \ +extension "DAMAGE" \ +extension "GLX" \