Mirrored_Repos/prusaslicer-novnc
1
0
Fork 0
mirror of https://github.com/helfrichmichael/prusaslicer-novnc.git synced 2024-08-30 18:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update to latest version and associated deps. and setup VGLRUN

Browse Source 
Signed-off-by: vajonam <152501+vajonam@users.noreply.github.com>
This commit is contained in:
vajonam 2024-04-03 13:09:07 -04:00
parent a22e774330
commit 331d203198
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -4,10 +4,11 @@ ARG UBUNTU_VERSION=22.04
FROM nvidia/opengl:1.2-glvnd-runtime-ubuntu${UBUNTU_VERSION}
LABEL authors="Joshua J. Damanik, vajonam"
ARG VIRTUALGL_VERSION=3.1
ARG TURBOVNC_VERSION=3.1
ARG VIRTUALGL_VERSION=3.1.1-20240228
ARG TURBOVNC_VERSION=3.1.1-20240127
ENV DEBIAN_FRONTEND noninteractive
RUN
# Install some basic dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
wget \
@ -17,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libegl1-mesa \
libgl1-mesa-glx \
openbox \
locales-all \
locales-all libpam0g libxt6 libxext6 dbus-x11 xauth x11-xkb-utils xkb-data, python3\
xterm \
novnc \
lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
@ -30,8 +31,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# Install virtualgl and turbovnc
RUN wget -qO /tmp/virtualgl_${VIRTUALGL_VERSION}_amd64.deb https://sourceforge.net/projects/virtualgl/files/${VIRTUALGL_VERSION}/virtualgl_${VIRTUALGL_VERSION}_amd64.deb/download \
&& wget -qO /tmp/turbovnc_${TURBOVNC_VERSION}_amd64.deb https://sourceforge.net/projects/turbovnc/files/${TURBOVNC_VERSION}/turbovnc_${TURBOVNC_VERSION}_amd64.deb/download \
RUN wget -qO /tmp/virtualgl_${VIRTUALGL_VERSION}_amd64.deb https://packagecloud.io/dcommander/virtualgl/packages/any/any/virtualgl_${VIRTUALGL_VERSION}_amd64.deb/download.deb?distro_version_id=35\
&& wget -qO /tmp/turbovnc_${TURBOVNC_VERSION}_amd64.deb https://packagecloud.io/dcommander/turbovnc/packages/any/any/turbovnc_${TURBOVNC_VERSION}_amd64.deb/download.deb?distro_version_id=35 \
&& dpkg -i /tmp/virtualgl_${VIRTUALGL_VERSION}_amd64.deb \
&& dpkg -i /tmp/turbovnc_${TURBOVNC_VERSION}_amd64.deb \
&& rm -rf /tmp/*.deb

4
entrypoint.sh
View File

@ -16,7 +16,7 @@ else
export VNC_SEC="-securitytypes TLSNone,X509None,None"
fi
export LOCALFBPORT=$((${VNC_PORT} + DISPLAY_NUMBER))
export VGLRUN=/usr/bin/vglrun
export VGLRUN="${VGLRUN:-/usr/bin/vglrun}"
# fix perms and launch supervisor with the above environment variables
chown -R slic3r:slic3r /home/slic3r/ /configs/ /prints/ /dev/stdout && exec gosu slic3r supervisord # -e TRACE
chown -R slic3r:slic3r /home/slic3r/ /configs/ /prints/ /dev/stdout && exec gosu slic3r supervisord -e TRACE

2
supervisord.conf
View File

@ -16,7 +16,7 @@ redirect_stderr=true
[program:prusaslicer]
priority=1
environment=DISPLAY=%(ENV_DISPLAY)s
environment=VGL_DISPLAY=%(ENV_VGL_DISPLAY)s
command=/bin/bash -c '%(ENV_VGLRUN)s /slic3r/slic3r-dist/prusa-slicer --datadir /configs/.config/PrusaSlicer/'
autorestart=true
redirect_stderr=true