mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 06:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix chrome trying to use novnc in docker when its not available

Browse source
This commit is contained in:
Nick Sweeting 2024-10-04 22:29:32 -07:00
parent beefe69b74
commit 497d3e9c2d
No known key found for this signature in database
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -214,7 +214,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
at-spi2-common fonts-liberation fonts-noto-color-emoji fonts-tlwg-loma-otf fonts-unifont libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libavahi-client3 \ at-spi2-common fonts-liberation fonts-noto-color-emoji fonts-tlwg-loma-otf fonts-unifont libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libavahi-client3 \
libavahi-common-data libavahi-common3 libcups2 libfontenc1 libice6 libnspr4 libnss3 libsm6 libunwind8 \ libavahi-common-data libavahi-common3 libcups2 libfontenc1 libice6 libnspr4 libnss3 libsm6 libunwind8 \
libxaw7 libxcomposite1 libxdamage1 libxfont2 \ libxaw7 libxcomposite1 libxdamage1 libxfont2 \
libxkbfile1 libxmu6 libxpm4 libxt6 x11-xkb-utils xfonts-encodings \ libxkbfile1 libxmu6 libxpm4 libxt6 x11-xkb-utils x11-utils xfonts-encodings \
# xfonts-scalable xfonts-utils xserver-common xvfb \ # xfonts-scalable xfonts-utils xserver-common xvfb \
# chrome can run without dbus/upower technically, it complains about missing dbus but should run ok anyway # chrome can run without dbus/upower technically, it complains about missing dbus but should run ok anyway
# libxss1 dbus dbus-x11 upower \ # libxss1 dbus dbus-x11 upower \
@ -288,7 +288,6 @@ RUN openssl rand -hex 16 > /etc/machine-id
ENV IN_DOCKER=True \ ENV IN_DOCKER=True \
SYSTEM_LIB_DIR=/app/lib \ SYSTEM_LIB_DIR=/app/lib \
SYSTEM_TMP_DIR=/tmp \ SYSTEM_TMP_DIR=/tmp \
DISPLAY=novnc:0.0 \
GOOGLE_API_KEY=no \ GOOGLE_API_KEY=no \
GOOGLE_DEFAULT_CLIENT_ID=no \ GOOGLE_DEFAULT_CLIENT_ID=no \
GOOGLE_DEFAULT_CLIENT_SECRET=no \ GOOGLE_DEFAULT_CLIENT_SECRET=no \

7
bin/docker_entrypoint.sh
View file

@ -81,6 +81,13 @@ else
mkdir -p "$DATA_DIR/logs" mkdir -p "$DATA_DIR/logs"
fi fi
# check if novnc x11 $DISPLAY is available
export DISPLAY="${DISPLAY:-"novnc:0.0"}"
if ! xdpyinfo > /dev/null 2>&1; then
# cant connect to x11 display, unset it so that chrome doesn't try to connect to it and hang indefinitely
unset DISPLAY
fi
# force set the ownership of the data dir contents to the archivebox user and group # force set the ownership of the data dir contents to the archivebox user and group
# this is needed because Docker Desktop often does not map user permissions from the host properly # this is needed because Docker Desktop often does not map user permissions from the host properly
chown $PUID:$PGID "$DATA_DIR" chown $PUID:$PGID "$DATA_DIR"