diff --git a/Dockerfile b/Dockerfile index 0b763b0..128a467 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN \ https://github.com/selkies-project/selkies.git \ /src && \ cd /src && \ - git checkout -f fe21491c3ee7467cb37c2367d294e353ca0b7b7a + git checkout -f 39bc3c98b283992a5fa16bfaac9b3fea94123868 RUN \ echo "**** build frontend ****" && \ @@ -72,6 +72,8 @@ RUN \ libXext-devel \ libXfixes-devel \ make \ + opus-devel \ + pulseaudio-libs-devel \ pkgconf-pkg-config \ python3-devel \ python3-pip \ @@ -83,6 +85,7 @@ RUN \ bash \ ca-certificates \ cmake \ + cvt \ dbus-x11 \ docker \ docker-compose \ @@ -93,15 +96,9 @@ RUN \ glibc-all-langpacks \ glibc-locale-source \ gnutls \ - gobject-introspection \ google-noto-cjk-fonts \ google-noto-emoji-fonts \ google-noto-sans-fonts \ - gstreamer1 \ - gstreamer1-plugins-bad-free \ - gstreamer1-plugins-base \ - gstreamer1-plugins-good \ - gstreamer1-plugins-ugly \ intel-media-driver \ kbd \ libev \ @@ -132,15 +129,15 @@ RUN \ openbox \ openssh-clients \ openssl \ + opus \ p11-kit \ pam \ pciutils \ procps-ng \ pulseaudio \ + pulseaudio-libs \ pulseaudio-utils \ python3 \ - python3-gobject \ - python3-gstreamer1 \ python3-setuptools \ shadow-utils \ st \ @@ -171,10 +168,10 @@ RUN \ xterm \ zlib && \ echo "**** install selkies ****" && \ - pip3 install pixelflux --break-system-packages && \ + pip3 install pcmflux pixelflux --break-system-packages && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/fe21491c3ee7467cb37c2367d294e353ca0b7b7a.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/39bc3c98b283992a5fa16bfaac9b3fea94123868.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ @@ -246,8 +243,8 @@ RUN \ libjpeg-turbo-devel \ libX11-devel \ libXext-devel \ + pulseaudio-libs-devel \ python3-devel \ - x264-devel && \ dnf autoremove -y && \ dnf clean all && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6a18081..1f3a11f 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 fe21491c3ee7467cb37c2367d294e353ca0b7b7a + git checkout -f 39bc3c98b283992a5fa16bfaac9b3fea94123868 RUN \ echo "**** build frontend ****" && \ @@ -72,6 +72,8 @@ RUN \ libXext-devel \ libXfixes-devel \ make \ + opus-devel \ + pulseaudio-libs-devel \ pkgconf-pkg-config \ python3-devel \ python3-pip \ @@ -94,15 +96,9 @@ RUN \ glibc-all-langpacks \ glibc-locale-source \ gnutls \ - gobject-introspection \ google-noto-cjk-fonts \ google-noto-emoji-fonts \ google-noto-sans-fonts \ - gstreamer1 \ - gstreamer1-plugins-bad-free \ - gstreamer1-plugins-base \ - gstreamer1-plugins-good \ - gstreamer1-plugins-ugly \ kbd \ libev \ libfontenc \ @@ -132,15 +128,15 @@ RUN \ openbox \ openssh-clients \ openssl \ + opus \ p11-kit \ pam \ pciutils \ procps-ng \ pulseaudio \ + pulseaudio-libs \ pulseaudio-utils \ python3 \ - python3-gobject \ - python3-gstreamer1 \ python3-setuptools \ shadow-utils \ st \ @@ -170,10 +166,10 @@ RUN \ xterm \ zlib && \ echo "**** install selkies ****" && \ - pip3 install pixelflux --break-system-packages && \ + pip3 install pcmflux pixelflux --break-system-packages && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/fe21491c3ee7467cb37c2367d294e353ca0b7b7a.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/39bc3c98b283992a5fa16bfaac9b3fea94123868.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ @@ -245,8 +241,8 @@ RUN \ libjpeg-turbo-devel \ libX11-devel \ libXext-devel \ + pulseaudio-libs-devel \ python3-devel \ - x264-devel && \ dnf autoremove -y && \ dnf clean all && \ rm -rf \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run index 41cebcb..9f93c3c 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run @@ -62,9 +62,9 @@ if [ ! -z ${DEV_MODE+x} ]; then fi -# Start the Selkies-GStreamer WebRTC HTML5 remote desktop application +# Start Selkies exec s6-setuidgid abc \ - selkies-gstreamer \ + selkies \ --addr="localhost" \ --port="8081" \ --enable_basic_auth="false" \