mirrors/docker-tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/docker-tachidesk.git synced 2025-12-10 06:42:12 +01:00
Code Issues Projects Releases Wiki Activity

Switch to xvfb-run instead of manually calling Xvfb (#141)

Browse Source 
This should ensure it always finds a display number. It also makes sure
to properly kill `Xvfb`, which we did not do before.
This commit is contained in:
Constantin Piber
2025-07-06 18:48:38 +02:00
committed by GitHub
parent fe65ce8873
commit ea7a79e50a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -49,7 +49,7 @@ RUN apt-get update && \
# install unzip to unzip the server-reference.conf from the jar # install unzip to unzip the server-reference.conf from the jar
RUN apt-get update && \ RUN apt-get update && \
apt-get -y install -y unzip && \ apt-get -y install -y unzip tini && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@@ -100,6 +100,7 @@ RUN if command -v Xvfb; then \
USER suwayomi USER suwayomi
EXPOSE 4567 EXPOSE 4567
ENTRYPOINT ["tini", "--"]
CMD ["/home/suwayomi/startup_script.sh"] CMD ["/home/suwayomi/startup_script.sh"]
# vim: set ft=dockerfile: # vim: set ft=dockerfile:

10
scripts/startup_script.sh
View File

@@ -97,10 +97,7 @@ sed -i -r "s/server.opdsShowOnlyDownloadedChapters = ([0-9]+|[a-zA-Z]+)( #)?/ser
sed -i -r "s/server.opdsChapterSortOrder = \"(.*?)\"( #)?/server.opdsChapterSortOrder = \"${OPDS_CHAPTER_SORT_ORDER:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf sed -i -r "s/server.opdsChapterSortOrder = \"(.*?)\"( #)?/server.opdsChapterSortOrder = \"${OPDS_CHAPTER_SORT_ORDER:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
if command -v Xvfb >/dev/null; then if command -v Xvfb >/dev/null; then
rm -f /tmp/.X0-lock command="xvfb-run --auto-servernum java"
Xvfb :0 -screen 0 800x680x24 -nolisten tcp >/dev/null 2>&1 &
export DISPLAY=:0
if [ -d /opt/kcef/jcef ]; then if [ -d /opt/kcef/jcef ]; then
# if we have KCEF downloaded in the container, attempt to link it into the data directory where Suwayomi expects it # if we have KCEF downloaded in the container, attempt to link it into the data directory where Suwayomi expects it
if [ ! -d /home/suwayomi/.local/share/Tachidesk/bin ]; then if [ ! -d /home/suwayomi/.local/share/Tachidesk/bin ]; then
@@ -113,7 +110,7 @@ if command -v Xvfb >/dev/null; then
if [ -d /home/suwayomi/.local/share/Tachidesk/bin/kcef ] || [ -L /home/suwayomi/.local/share/Tachidesk/bin/kcef ]; then if [ -d /home/suwayomi/.local/share/Tachidesk/bin/kcef ] || [ -L /home/suwayomi/.local/share/Tachidesk/bin/kcef ]; then
# make sure all files are always executable. KCEF (and our downloader) ensure this on creation, but if the flag is lost # make sure all files are always executable. KCEF (and our downloader) ensure this on creation, but if the flag is lost
# at some point, CEF will die # at some point, CEF will die
chmod -R a+x /home/suwayomi/.local/share/Tachidesk/bin/kcef || true chmod -R a+x /home/suwayomi/.local/share/Tachidesk/bin/kcef 2>/dev/null || true
fi fi
export LD_PRELOAD=/home/suwayomi/.local/share/Tachidesk/bin/kcef/libcef.so export LD_PRELOAD=/home/suwayomi/.local/share/Tachidesk/bin/kcef/libcef.so
else else
@@ -121,6 +118,7 @@ else
fi fi
if [ -f /opt/catch_abort.so ]; then if [ -f /opt/catch_abort.so ]; then
export LD_PRELOAD="/opt/catch_abort.so $LD_PRELOAD" export LD_PRELOAD="/opt/catch_abort.so $LD_PRELOAD"
command="java"
fi fi
echo "LD_PRELOAD=$LD_PRELOAD" echo "LD_PRELOAD=$LD_PRELOAD"
exec java -Duser.home=/home/suwayomi -jar "/home/suwayomi/startup/tachidesk_latest.jar"; exec $command -Duser.home=/home/suwayomi -jar "/home/suwayomi/startup/tachidesk_latest.jar";