From 430d65602e947a6d7a3caaba566987ab8ff96822 Mon Sep 17 00:00:00 2001
From: Oli <gugger@gmail.com>
Date: Tue, 21 Oct 2025 21:17:36 +0200
Subject: [PATCH] docker: add specific Dockerfile for Umbrel builds

We add a new umbrel.Dockerfile that builds a chantools image including
github.com/tsl0922/ttyd for easy web access to the CLI.
---
 docker/umbrel.Dockerfile | 22 ++++++++++++++++++++++
 release.sh               | 12 +++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 docker/umbrel.Dockerfile

diff --git a/docker/umbrel.Dockerfile b/docker/umbrel.Dockerfile
new file mode 100644
index 0000000..dbe081f
--- /dev/null
+++ b/docker/umbrel.Dockerfile
@@ -0,0 +1,22 @@
+# Start with the chantools base image
+ARG VERSION
+FROM guggero/chantools:${VERSION:-latest} AS golangbuilder
+
+FROM tsl0922/ttyd:1.7.7-alpine@sha256:e17d5420fa78ea6271e32a06eec334adda6f54077e56e3969340fb47e604c24c AS final
+
+# Define a root volume for data persistence.
+VOLUME /chantools
+WORKDIR /chantools
+
+# We'll expect the lnd data directory to be mounted here.
+VOLUME /lnd
+
+# Copy the binaries and entrypoint from the builder image.
+COPY --from=golangbuilder /bin/chantools /bin/
+COPY ./docker/bash-wrapper.sh /bash-wrapper.sh
+
+# Add bash.
+RUN apk add --no-cache \
+  bash \
+  jq \
+  ca-certificates \
diff --git a/release.sh b/release.sh
index 20a0504..aa9c031 100755
--- a/release.sh
+++ b/release.sh
@@ -84,7 +84,17 @@ function build_release() {
 #   arguments: <version-tag>
 function docker_release() {
   local tag=$1
-  docker buildx build --platform linux/arm64,linux/amd64 --tag $DOCKER_USER/$PACKAGE:$tag --output "type=registry" .
+  docker buildx build \
+    --platform linux/arm64,linux/amd64 \
+    --tag $DOCKER_USER/$PACKAGE:$tag \
+    --tag $DOCKER_USER/$PACKAGE:latest --output "type=registry" .
+    
+  docker buildx build \
+    -f docker/umbrel.Dockerfile \
+    --platform linux/arm64,linux/amd64 \
+    --build-arg VERSION=$tag \
+    --tag $DOCKER_USER/$PACKAGE:$tag-umbrel \
+    --tag $DOCKER_USER/$PACKAGE:latest-umbrel --output "type=registry" .
 }
 
 # usage prints the usage of the whole script.