reimplement signer-miner image variant as a target of the cmake Dockerfile

Author: 1ma

cmake/Dockerfile

@@ -16,7 +16,9 @@ RUN apk add --no-cache \
     jq \
  && curl -s https://api.github.com/repos/bitcoinknots/guix.sigs/contents/builder-keys | jq -r '.[].download_url' | while read url; do curl -s "$url" | gpg --import; done \
  && gpg --verify SHA256SUMS.asc SHA256SUMS \
- && sha256sum --ignore-missing -c SHA256SUMS
+ && sha256sum --ignore-missing -c SHA256SUMS \
+ && tar zxf bitcoin-${KNOTS_VERSION}.tar.gz \
+ && mv bitcoin-${KNOTS_VERSION} bitcoin
 
 
 FROM alpine:3.23 AS builder
@@ -57,6 +59,31 @@ RUN cmake --build build -j $(nproc)
 RUN cmake --install build
 
 
+FROM alpine:3.23 AS signet-miner
+
+ENV CLI_CMD=bitcoin-cli
+ENV MINING_XPUB=tr(tpubXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/0/*)#xxxxxxxx
+
+COPY --from=1maa/bitcoin:latest /usr/local/bin/bitcoin-cli  /usr/local/bin/bitcoin-cli
+COPY --from=1maa/bitcoin:latest /usr/local/bin/bitcoin-util /usr/local/bin/bitcoin-util
+
+COPY --from=verifier /tmp/bitcoin/test/functional/test_framework /usr/local/src/bitcoin/test/functional/test_framework
+COPY --from=verifier /tmp/bitcoin/contrib/signet/miner           /usr/local/src/bitcoin/contrib/signet/miner
+
+COPY --chown=0:0 --chmod=755 signet-miner-entrypoint.sh /opt/entrypoint.sh
+
+RUN apk add --no-cache \
+    python3 \
+ && adduser -D bitcoin \
+ && ln -s /usr/local/src/bitcoin/contrib/signet/miner /usr/local/bin/miner
+
+USER bitcoin
+
+STOPSIGNAL SIGINT
+
+ENTRYPOINT ["/opt/entrypoint.sh"]
+
+
 FROM alpine:3.23 AS final
 
 ARG KNOTS_VERSION

miner/entrypoint.sh cmake/signet-miner-entrypoint.shminer/entrypoint.sh renamed to cmake/signet-miner-entrypoint.sh

@@ -1,6 +1,6 @@
 variable "CONTEXT" {
-  type = string
-  default = "cmake"
+  type        = string
+  default     = "cmake"
   description = "autotools up to v28.1.knots20250305, cmake after"
   validation {
     condition = contains(["autotools", "cmake"], CONTEXT)
@@ -9,8 +9,8 @@ variable "CONTEXT" {
 }
 
 variable "RUNNER" {
-  type = string
-  default = "ubuntu-24.04"
+  type        = string
+  default     = "ubuntu-24.04"
   description = "Runner that built the image"
   validation {
     condition = contains(["ubuntu-24.04", "ubuntu-24.04-arm"], RUNNER)
@@ -19,8 +19,8 @@ variable "RUNNER" {
 }
 
 variable "VERSION" {
-  type = string
-  default = "29.2.knots20251110"
+  type        = string
+  default     = "29.2.knots20251110"
   description = "Version of Knots to build"
   validation {
     condition = contains([
@@ -40,27 +40,32 @@ group "default" {
 
 target "knots" {
   args = {
-    KNOTS_VERSION = "${VERSION}"
+    KNOTS_VERSION = VERSION
   }
-  context = "${CONTEXT}"
-  cache-to = [{type = "inline"}]
-  cache-from = [{
-    type = "registry"
-    ref = "ghcr.io/bcnbitcoinonly/bitcoin:v${VERSION}-${RUNNER}"
-  }]
+  context = CONTEXT
+  cache-to = [{ type = "inline" }]
+  cache-from = [
+    {
+      type = "registry"
+      ref  = "ghcr.io/bcnbitcoinonly/bitcoin:v${VERSION}-${RUNNER}"
+    }
+  ]
   tags = ["ghcr.io/bcnbitcoinonly/bitcoin:v${VERSION}-${RUNNER}"]
 }
 
 target "miner" {
   args = {
-    KNOTS_VERSION = "29.2.knots20251110"
+    KNOTS_VERSION = VERSION
   }
-  context = "miner"
-  cache-to = [{type = "inline"}]
-  cache-from = [{
-    type = "registry"
-    ref = "1maa/bitcoin:signet-miner"
-  }]
+  context = "cmake"
+  cache-to = [{ type = "inline" }]
+  cache-from = [
+    {
+      type = "registry"
+      ref  = "1maa/bitcoin:signet-miner"
+    }
+  ]
   platforms = ["linux/amd64", "linux/arm64"]
   tags = ["1maa/bitcoin:signet-miner"]
+  target = "signet-miner"
 }