From 44c3c1bba9172e80becfe5e2ecc5a0d34eb603a5 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Mon, 31 Mar 2025 09:25:02 +0100 Subject: [PATCH 1/3] remove unused docker_registry param --- src/warnet/image.py | 11 ++++++----- src/warnet/image_build.py | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/warnet/image.py b/src/warnet/image.py index c43323f15..5d89e606a 100644 --- a/src/warnet/image.py +++ b/src/warnet/image.py @@ -13,7 +13,6 @@ def image(): @image.command() @click.option("--repo", required=True, type=str) @click.option("--commit-sha", required=True, type=str) -@click.option("--registry", required=True, type=str) @click.option( "--tags", required=True, @@ -24,10 +23,12 @@ def image(): @click.option("--arches", required=False, type=str) @click.option("--action", required=False, type=str, default="load") def build(repo, commit_sha, registry, tags, build_args, arches, action): + """Build a Bitcoin Core Docker image with specified parameters. + + \b + Usage: + warnet image build --repo bitcoin/bitcoin --commit-sha d6db87165c6dc2123a759c79ec236ea1ed90c0e3 --tags bitcoindevproject/bitcoin:v29.0-rc2 --action push """ - Build bitcoind and bitcoin-cli from at with the specified . - Optionally deploy to remote registry using --action=push, otherwise image is loaded to local registry. - """ - res = build_image(repo, commit_sha, registry, tags, build_args, arches, action) + res = build_image(repo, commit_sha, tags, build_args, arches, action) if not res: sys.exit(1) diff --git a/src/warnet/image_build.py b/src/warnet/image_build.py index 4fa2ffea5..6aacfb395 100644 --- a/src/warnet/image_build.py +++ b/src/warnet/image_build.py @@ -17,7 +17,6 @@ def run_command(command): def build_image( repo: str, commit_sha: str, - docker_registry: str, tags: str, build_args: str, arches: str, @@ -41,7 +40,6 @@ def build_image( print(f"{repo=:}") print(f"{commit_sha=:}") - print(f"{docker_registry=:}") print(f"{tags=:}") print(f"{build_args=:}") print(f"{build_arches=:}") From ff346913efd2fe6e9eb57422181ce18425e33327 Mon Sep 17 00:00:00 2001 From: Matthew Zipkin Date: Mon, 31 Mar 2025 11:10:13 -0400 Subject: [PATCH 2/3] TypeError: build() missing 1 required positional argument: 'registry' --- src/warnet/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/warnet/image.py b/src/warnet/image.py index 5d89e606a..b0751142f 100644 --- a/src/warnet/image.py +++ b/src/warnet/image.py @@ -22,7 +22,7 @@ def image(): @click.option("--build-args", required=False, type=str) @click.option("--arches", required=False, type=str) @click.option("--action", required=False, type=str, default="load") -def build(repo, commit_sha, registry, tags, build_args, arches, action): +def build(repo, commit_sha, tags, build_args, arches, action): """Build a Bitcoin Core Docker image with specified parameters. \b From 7af515bcd3ff7c73e770f62c3eacdd7217e2afba Mon Sep 17 00:00:00 2001 From: Matthew Zipkin Date: Mon, 31 Mar 2025 16:17:48 -0400 Subject: [PATCH 3/3] add example to build image docs --- src/warnet/image.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/warnet/image.py b/src/warnet/image.py index b0751142f..a13fe8e6e 100644 --- a/src/warnet/image.py +++ b/src/warnet/image.py @@ -26,8 +26,11 @@ def build(repo, commit_sha, tags, build_args, arches, action): """Build a Bitcoin Core Docker image with specified parameters. \b - Usage: - warnet image build --repo bitcoin/bitcoin --commit-sha d6db87165c6dc2123a759c79ec236ea1ed90c0e3 --tags bitcoindevproject/bitcoin:v29.0-rc2 --action push + Usage Examples: + # Build an image for Warnet repository + warnet image build --repo bitcoin/bitcoin --commit-sha d6db87165c6dc2123a759c79ec236ea1ed90c0e3 --tags bitcoindevproject/bitcoin:v29.0-rc2 --arches amd64,arm64,armhf --action push + # Build an image for local testing + warnet image build --repo bitcoin/bitcoin --commit-sha d6db87165c6dc2123a759c79ec236ea1ed90c0e3 --tags bitcoindevproject/bitcoin:v29.0-rc2 --action load """ res = build_image(repo, commit_sha, tags, build_args, arches, action) if not res: