diff --git a/Dockerfile b/Dockerfile index 0712d11..b60b698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,14 +72,15 @@ COPY entrypoint.sh /entrypoint.sh COPY menu.xml /etc/xdg/openbox/ COPY supervisord.conf /etc/ -# HTTP Port -EXPOSE 8080 -# VNC Port -EXPOSE 5900 +# Needs to be ran with HOST networking so this are no longer needed. +# # HTTP Port +# EXPOSE 8080 + +# # VNC Port +# EXPOSE 5900 VOLUME /configs/ VOLUME /prints/ ENTRYPOINT ["/entrypoint.sh"] -CMD ["bash", "-c", "chown -R slic3r:slic3r /home/slic3r/ /configs/ /prints/ /dev/stdout && exec gosu slic3r supervisord"] diff --git a/entrypoint.sh b/entrypoint.sh index 1625315..9d38154 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -15,5 +15,7 @@ else export VNC_SEC="-securitytypes TLSNone,X509None,None" fi export LOCALFBPORT=$((5900 + DISPLAY_NUMBER)) -export VGLRUN=vglrun +export 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