mirror of
https://github.com/linuxserver/docker-baseimage-selkies.git
synced 2026-03-16 00:02:11 +08:00
fixes #36, authoratative server
This commit is contained in:
parent
126751170a
commit
0f3231d98f
@ -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-* && \
|
||||
|
||||
@ -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-* && \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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" \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user