diff --git a/Dockerfile b/Dockerfile index a625e37..1441716 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN \ https://github.com/selkies-project/selkies.git \ /src && \ cd /src && \ - git checkout -f 7594ac10262b950f98283d0e8a2823159370de32 + git checkout -f f3fc27c6c1d1080cdc83c9113aa66d2c9d3906c3 RUN \ echo "**** build frontend ****" && \ @@ -24,17 +24,16 @@ RUN \ cd addons/gst-web-core && \ npm install && \ npm run build && \ + cp dist/selkies-core.js ../selkies-dashboard/src && \ cd ../selkies-dashboard && \ npm install && \ npm run build && \ mkdir dist/src dist/nginx && \ - cp ../gst-web-core/dist/selkies-core.js dist/src/ && \ cp ../universal-touch-gamepad/universalTouchGamepad.js dist/src/ && \ cp ../gst-web-core/nginx/* dist/nginx/ && \ mkdir /buildout && \ cp -ar dist/* /buildout/ - # Runtime stage FROM ghcr.io/linuxserver/baseimage-debian:bookworm @@ -177,7 +176,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/7594ac10262b950f98283d0e8a2823159370de32.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/f3fc27c6c1d1080cdc83c9113aa66d2c9d3906c3.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6887e84..db5b13e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,7 +16,7 @@ RUN \ https://github.com/selkies-project/selkies.git \ /src && \ cd /src && \ - git checkout -f 7594ac10262b950f98283d0e8a2823159370de32 + git checkout -f f3fc27c6c1d1080cdc83c9113aa66d2c9d3906c3 RUN \ echo "**** build frontend ****" && \ @@ -24,17 +24,16 @@ RUN \ cd addons/gst-web-core && \ npm install && \ npm run build && \ + cp dist/selkies-core.js ../selkies-dashboard/src && \ cd ../selkies-dashboard && \ npm install && \ npm run build && \ mkdir dist/src dist/nginx && \ - cp ../gst-web-core/dist/selkies-core.js dist/src/ && \ cp ../universal-touch-gamepad/universalTouchGamepad.js dist/src/ && \ cp ../gst-web-core/nginx/* dist/nginx/ && \ mkdir /buildout && \ cp -ar dist/* /buildout/ - # Runtime stage FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-bookworm @@ -175,7 +174,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ curl -o \ /tmp/selkies.tar.gz -L \ - "https://github.com/selkies-project/selkies/archive/7594ac10262b950f98283d0e8a2823159370de32.tar.gz" && \ + "https://github.com/selkies-project/selkies/archive/f3fc27c6c1d1080cdc83c9113aa66d2c9d3906c3.tar.gz" && \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ diff --git a/README.md b/README.md index 10a8ba5..bc10503 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,12 @@ The purpose of these images is to provide a full featured web native Linux deskt These images contain the following services: * [Selkies](https://github.com/selkies-project) - The core technology for interacting with a containerized desktop from a web browser. +* [pixelflux](https://github.com/linuxserver/pixelflux/) - The core video/image rendering pipeline. +* [pcmflux](https://github.com/linuxserver/pcmflux) - Lean low level web native opus audio encoder. * [NGINX](https://www.nginx.com/) - Used to serve Selkies with the appropriate paths and provide basic auth. * [Docker](https://www.docker.com/) - Can be used for interacting with a mounted in Docker socket or if the container is run in privileged mode will start a [DinD](https://www.docker.com/blog/docker-can-now-run-within-docker/) setup. * [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/) - Sound subsystem used to capture audio from the active desktop session and send it to the browser. -* [GStreamer](https://gstreamer.freedesktop.org/) - Used to encode X11 with multiple video codecs and send it to the client. + # Options **Authentication for these containers is included as a convenience and to keep in sync with the previous KasmVNC containers they replace. We use bash to substitute in settings user/password and some strings might break that. In general this authentication mechanism should be used to keep the kids out not the internet** diff --git a/readme-vars.yml b/readme-vars.yml index 08854da..38d5198 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,10 +16,12 @@ full_custom_readme: | These images contain the following services: * [Selkies](https://github.com/selkies-project) - The core technology for interacting with a containerized desktop from a web browser. + * [pixelflux](https://github.com/linuxserver/pixelflux/) - The core video/image rendering pipeline. + * [pcmflux](https://github.com/linuxserver/pcmflux) - Lean low level web native opus audio encoder. * [NGINX](https://www.nginx.com/) - Used to serve Selkies with the appropriate paths and provide basic auth. * [Docker](https://www.docker.com/) - Can be used for interacting with a mounted in Docker socket or if the container is run in privileged mode will start a [DinD](https://www.docker.com/blog/docker-can-now-run-within-docker/) setup. * [PulseAudio](https://www.freedesktop.org/wiki/Software/PulseAudio/) - Sound subsystem used to capture audio from the active desktop session and send it to the browser. - * [GStreamer](https://gstreamer.freedesktop.org/) - Used to encode X11 with multiple video codecs and send it to the client. + # Options **Authentication for these containers is included as a convenience and to keep in sync with the previous KasmVNC containers they replace. We use bash to substitute in settings user/password and some strings might break that. In general this authentication mechanism should be used to keep the kids out not the internet**