Merge branch 'master' into 251-add-freebsd-support

bitcoin-tools · Aug 22, 2024 · d7a43a7 · d7a43a7
2 parents f34350c + 3f402ab
commit d7a43a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docker/Dockerfile_opensuse-leap b/docker/Dockerfile_opensuse-leap
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 # openSUSE is a robust Linux distribution that offers a great balance of stability and modernity.
 # This Dockerfile is ideal for users seeking a reliable, versatile operating system.
-FROM opensuse/leap:latest@sha256:79ea90d85d64c37a0985281f405f3336ac199f5ed1a041108472d248c03851d8
+FROM opensuse/leap:latest@sha256:b92aba5f8413624d1a4b671dff4858e454fcbe5e38dff1880cc48241750c2e8e
 
 # Set the terminal type to Xterm.
 ENV TERM=xterm

diff --git a/docker/Dockerfile_opensuse-tumbleweed b/docker/Dockerfile_opensuse-tumbleweed
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 # openSUSE is a robust Linux distribution that offers a great balance of stability and modernity.
 # This Dockerfile is ideal for users seeking a reliable, versatile operating system.
-FROM opensuse/tumbleweed:latest@sha256:d0edd263099dd283cc8f0f620b22954f1f92a94c96ef0ee2ffb19140605be33d
+FROM opensuse/tumbleweed:latest@sha256:e546d6b00fd6f517366d1b83928893ba92e439e75153a0249accb908a1078ec6
 
 # Set the terminal type to Xterm.
 ENV TERM=xterm

diff --git a/nodebuilder b/nodebuilder
@@ -1477,6 +1477,7 @@ esac
 log_info 'Starting Bitcoin Core.'
 if is_running_in_ci ||
   is_running_in_container ||
+  [ -z "${DISPLAY}" ] ||
   ! command -v bitcoin-qt > /dev/null 2>&1; then
   bitcoind --daemonwait > /dev/null
 elif [ "${TARGET_KERNEL}" = 'Darwin' ]; then