Skip to content

Commit

Permalink
fix: install dependencies for websockify utils in novnc (#2443)
Browse files Browse the repository at this point in the history
Signed-off-by: Viet Nguyen Duc <[email protected]>
  • Loading branch information
VietND96 authored Oct 25, 2024
1 parent 3290a30 commit a5e252c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions Base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
supervisor \
gnupg2 \
libnss3-tools \
python3-pip \
openjdk-${JRE_VERSION}-jre-headless \
&& if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
export ARCH=armhf ; \
Expand Down
12 changes: 10 additions & 2 deletions NodeBase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ RUN --mount=type=secret,id=SEL_PASSWD \
&& apt-get -qyy autoremove \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get -qyy clean \
&& pip install --no-cache-dir --upgrade --break-system-packages setuptools \
########################################
# noVNC exposes VNC through a web page #
########################################
Expand All @@ -117,9 +118,16 @@ RUN --mount=type=secret,id=SEL_PASSWD \
"https://github.com/novnc/websockify/archive/refs/${WEBSOCKIFY_SOURCE}/${WEBSOCKIFY_VERSION}.zip" \
&& unzip -x websockify.zip \
&& rm websockify.zip \
&& mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify \
# Setup dependencies
&& cd websockify-${WEBSOCKIFY_VERSION} \
&& python3 setup.py install \
# Move websockify and run to the noVNC directory
&& mv websockify /opt/bin/noVNC/utils/websockify \
&& mv run /opt/bin/noVNC/utils/websockify \
&& chmod +x /opt/bin/noVNC/utils/websockify/run \
&& rm -rf /opt/bin/noVNC/utils/websockify/docker /opt/bin/noVNC/utils/websockify/tests \
# Cleanup unnecessary files
&& cd .. \
&& rm -rf websockify-${WEBSOCKIFY_VERSION} \
#========================================================================
# Run this command for executable file permissions for /dev/shm when #
# this is a "child" container running in Docker Desktop and WSL2 distro #
Expand Down

0 comments on commit a5e252c

Please sign in to comment.