Seungmin Kim 1 жил өмнө
parent
commit
94b139c5d0

+ 2 - 2
Dockerfile

@@ -462,7 +462,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         vainfo \
         intel-gpu-tools \
         radeontop && \
-    if [ "$(grep VERSION_ID= /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; fi && \
+    if [ "$(grep VERSION_ID= /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; else apt-get install --no-install-recommends -y mesa-utils-extra; fi && \
     rm -rf /var/lib/apt/lists/* && \
     # Automatically fetch the latest selkies-gstreamer version and install the components
     SELKIES_VERSION="1.5.2" && \
@@ -521,7 +521,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     rm -rf /var/lib/apt/lists/* && \
     groupadd -g 1000 user && \
     useradd -ms /bin/bash user -u 1000 -g 1000 && \
-    usermod -a -G adm,audio,cdrom,dialout,dip,fax,floppy,input,lp,lpadmin,plugdev,pulse-access,scanner,ssl-cert,sudo,tape,tty,video,voice user && \
+    usermod -a -G adm,audio,cdrom,dialout,dip,fax,floppy,input,lp,lpadmin,plugdev,pulse-access,render,scanner,ssl-cert,sudo,tape,tty,video,voice user && \
     echo "user ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
     chown user:user /home/user && \
     echo "user:${PASSWD}" | chpasswd && \

+ 1 - 14
selkies-gstreamer-entrypoint.sh

@@ -8,7 +8,7 @@
 . /opt/gstreamer/gst-env
 
 # Set default display
-export DISPLAY="${DISPLAY:-:0}"
+export DISPLAY="${DISPLAY:-\:0}"
 
 # Configure joystick interposer
 sudo mkdir -pm755 /dev/input
@@ -24,19 +24,6 @@ echo "Waiting for X socket"
 until [ -S "/tmp/.X11-unix/X${DISPLAY/:/}" ]; do sleep 1; done
 echo "X socket is ready"
 
-# Write Progressive Web App (PWA) configuration
-export PWA_APP_NAME="Selkies WebRTC"
-export PWA_APP_SHORT_NAME="selkies"
-export PWA_START_URL="/index.html"
-sudo sed -i \
-    -e "s|PWA_APP_NAME|${PWA_APP_NAME}|g" \
-    -e "s|PWA_APP_SHORT_NAME|${PWA_APP_SHORT_NAME}|g" \
-    -e "s|PWA_START_URL|${PWA_START_URL}|g" \
-/opt/gst-web/manifest.json && \
-sudo sed -i \
-    -e "s|PWA_CACHE|${PWA_APP_SHORT_NAME}-webrtc-pwa|g" \
-/opt/gst-web/sw.js
-
 # Clear the cache registry
 rm -rf "${HOME}/.cache/gstreamer-1.0"