|
|
@@ -7,6 +7,7 @@
|
|
|
|
|
|
ARG DISTRIB_RELEASE=24.04
|
|
|
ARG SELKIES_IMAGE=ghcr.io/selkies-project/selkies/py-build:main
|
|
|
+ARG SELKIES_WEB_IMAGE=ghcr.io/selkies-project/selkies/selkies-web:main
|
|
|
|
|
|
ARG SELKIES_GIT_REF=main
|
|
|
ARG NVIDIA_VAAPI_DRIVER_VERSION=latest
|
|
|
@@ -17,6 +18,7 @@ ARG NVIDIA_VAAPI_DRIVER_VERSION=latest
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
FROM ${SELKIES_IMAGE} AS selkies-build
|
|
|
+FROM ${SELKIES_WEB_IMAGE} AS selkies-web
|
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
@@ -426,15 +428,10 @@ ENV PATH="/opt/selkies/bin:/usr/local/nvidia/bin:${PATH}" \
|
|
|
# Install the Selkies wheel from the official stable build image.
|
|
|
COPY --from=selkies-runtime-builder /opt/selkies /opt/selkies
|
|
|
|
|
|
-RUN set -eux; \
|
|
|
- SELKIES_WEB_ROOT="$(/opt/selkies/bin/python -c 'from pathlib import Path; import selkies; print(Path(selkies.__file__).resolve().parent / "selkies_web")')"; \
|
|
|
- echo "Selkies web root: ${SELKIES_WEB_ROOT}"; \
|
|
|
- test -f "${SELKIES_WEB_ROOT}/index.html"; \
|
|
|
- ln -sfn "${SELKIES_WEB_ROOT}" /opt/selkies-web; \
|
|
|
- install -d -m 0755 \
|
|
|
- /tmp/nginx \
|
|
|
- /tmp/nginx/client_body \
|
|
|
- /tmp/nginx/proxy
|
|
|
+COPY --chown=${USER_UID}:${USER_GID} \
|
|
|
+ --from=selkies-web \
|
|
|
+ /usr/share/nginx/html/ \
|
|
|
+ /opt/selkies-web/
|
|
|
|
|
|
COPY --from=selkies-js-interposer-builder \
|
|
|
/out/selkies_joystick_interposer.so \
|
