diff --git a/.github/workflows/push_release_images.yaml b/.github/workflows/push_release_images.yaml index 57ba56073..f5cb93ca5 100644 --- a/.github/workflows/push_release_images.yaml +++ b/.github/workflows/push_release_images.yaml @@ -53,7 +53,7 @@ jobs: uses: docker/setup-buildx-action@v4 - name: Set container image tags # Set the tags for the {container}-{version} and {container} - # For example: ':alpine-v2.2.0' and ':alpine' + # For example: ':alpine-v2.3.0' and ':alpine' run: | TAGS="${{ env.DOCKERHUB_REPO }}:${{ matrix.container }}-${{ env.NODEBUILDER_VERSION }}" TAGS="${TAGS},${{ env.DOCKERHUB_REPO }}:${{ matrix.container }}" @@ -105,7 +105,7 @@ jobs: # Push if the CI run isn't from a beta prerelease push: ${{ !github.event.release.prerelease }} # Set the tags for the ubuntu-{version}, ubuntu, {version}, and latest - # For example, ':ubuntu-v2.2.0', ':ubuntu', ':v2.2.0', and ':latest' + # For example, ':ubuntu-v2.3.0', ':ubuntu', ':v2.3.0', and ':latest' tags: | ${{ env.DOCKERHUB_REPO }}:${{ env.DEFAULT_IMAGE }}-${{ needs.build-and-push.outputs.nodebuilder-version }} ${{ env.DOCKERHUB_REPO }}:${{ env.DEFAULT_IMAGE }} diff --git a/README.md b/README.md index 35ee655bf..5d8c77ad6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Run a secure Bitcoin Core node with ease. Copy-paste the following command into Terminal: ```sh -sh -c "$(curl -fsSL https://github.com/bitcoin-tools/nodebuilder/raw/v2.2.0/nodebuilder)" +sh -c "$(curl -fsSL https://github.com/bitcoin-tools/nodebuilder/raw/v2.3.0/nodebuilder)" ``` [![Supports: Docker](https://img.shields.io/badge/supports-Docker-blue.svg?logo=docker)](https://docs.docker.com) @@ -41,13 +41,13 @@ sh -c "$(curl -fsSL https://github.com/bitcoin-tools/nodebuilder/raw/v2.2.0/node As mentioned above, start the script from the command line. Open Terminal and run: ```sh -sh -c "$(curl -fsSL https://github.com/bitcoin-tools/nodebuilder/raw/v2.2.0/nodebuilder)" +sh -c "$(curl -fsSL https://github.com/bitcoin-tools/nodebuilder/raw/v2.3.0/nodebuilder)" ``` Or download the script to your local system, set permissions, and run it: ```sh -wget https://github.com/bitcoin-tools/nodebuilder/raw/v2.2.0/nodebuilder +wget https://github.com/bitcoin-tools/nodebuilder/raw/v2.3.0/nodebuilder chmod u+x nodebuilder ./nodebuilder ``` diff --git a/docker/Dockerfile b/docker/Dockerfile index 2f8852357..a767847a9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ FROM ubuntu:latest@sha256:2260313b31c8c011cd2eebe728008efac1b3982be73eb71348ea26 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_alpine b/docker/Dockerfile_alpine index 99f884569..7a2ac1ef6 100644 --- a/docker/Dockerfile_alpine +++ b/docker/Dockerfile_alpine @@ -7,7 +7,7 @@ FROM alpine:latest@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6ee ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_amazonlinux b/docker/Dockerfile_amazonlinux index 190dc041f..e40ad057e 100644 --- a/docker/Dockerfile_amazonlinux +++ b/docker/Dockerfile_amazonlinux @@ -7,7 +7,7 @@ FROM amazonlinux:latest@sha256:181f98c48832fe926f8ca3b6ffeafcce128e96e77b93d08fb ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_archlinux b/docker/Dockerfile_archlinux index 1a1643541..aad54903e 100644 --- a/docker/Dockerfile_archlinux +++ b/docker/Dockerfile_archlinux @@ -7,7 +7,7 @@ FROM archlinux:latest@sha256:b860afd5823683f7ea389ba5f00d812f4fe55f6f286dea329d2 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_debian b/docker/Dockerfile_debian index 126fde7b9..43532d58b 100644 --- a/docker/Dockerfile_debian +++ b/docker/Dockerfile_debian @@ -7,7 +7,7 @@ FROM debian:stable-slim@sha256:04634311a8d5fc442b6eb06d792293c4f3e2268652ca7634e ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_fedora b/docker/Dockerfile_fedora index 361df9e2b..0db33251a 100644 --- a/docker/Dockerfile_fedora +++ b/docker/Dockerfile_fedora @@ -7,7 +7,7 @@ FROM fedora:latest@sha256:43b29f65a41eb9c35e1cd5323e3bdf3b655c2357a9f4f1ff2f9c27 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_gentoo b/docker/Dockerfile_gentoo index 5de3d3b4a..e3c192eda 100644 --- a/docker/Dockerfile_gentoo +++ b/docker/Dockerfile_gentoo @@ -7,7 +7,7 @@ FROM gentoo/stage3:latest@sha256:6067704c9e8075416431b840c9c1bf0bb95cb8e0857e685 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_kali b/docker/Dockerfile_kali index 9755bbd66..cfeda0210 100644 --- a/docker/Dockerfile_kali +++ b/docker/Dockerfile_kali @@ -7,7 +7,7 @@ FROM kalilinux/kali-last-release@sha256:aa3222eb2e4b3b9c15542f1a081796bb2497f314 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_manjarolinux b/docker/Dockerfile_manjarolinux index f32c095e8..e9fbdc1c6 100644 --- a/docker/Dockerfile_manjarolinux +++ b/docker/Dockerfile_manjarolinux @@ -7,7 +7,7 @@ FROM manjarolinux/base:latest@sha256:bbf1f1d746f28e138eea610e140d2f28cbb5b7c5da2 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_opensuse b/docker/Dockerfile_opensuse index 292b88137..99a055dea 100644 --- a/docker/Dockerfile_opensuse +++ b/docker/Dockerfile_opensuse @@ -7,7 +7,7 @@ FROM opensuse/leap:16.0@sha256:f239b4819f4dd322d99509f1b5b14f2107bf23857f9ccd3c1 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_oraclelinux b/docker/Dockerfile_oraclelinux index dc5e19246..a9e910183 100644 --- a/docker/Dockerfile_oraclelinux +++ b/docker/Dockerfile_oraclelinux @@ -7,7 +7,7 @@ FROM oraclelinux:10@sha256:2f145af52abf6ee5be815b35751c65dc1531a4c709904c4fd7f72 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_redhat-ubi9 b/docker/Dockerfile_redhat-ubi9 index 8ea8a2b01..0c85579ea 100644 --- a/docker/Dockerfile_redhat-ubi9 +++ b/docker/Dockerfile_redhat-ubi9 @@ -7,7 +7,7 @@ FROM redhat/ubi9:latest@sha256:b8c53f907b7ea8934d6bb23b319ca7b5ab567e61a0806ffc8 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_rockylinux b/docker/Dockerfile_rockylinux index d6c5eeaa9..1a03a4aec 100644 --- a/docker/Dockerfile_rockylinux +++ b/docker/Dockerfile_rockylinux @@ -7,7 +7,7 @@ FROM rockylinux:9@sha256:d7be1c094cc5845ee815d4632fe377514ee6ebcf8efaed689288965 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/docker/Dockerfile_sles b/docker/Dockerfile_sles index 4c8e84606..92f9a9b5e 100644 --- a/docker/Dockerfile_sles +++ b/docker/Dockerfile_sles @@ -5,7 +5,7 @@ FROM registry.suse.com/suse/sle15:latest@sha256:b03880998771ffd522e8808bc01a3109 ENV TERM=xterm # Define the default version of nodebuilder or pass in a different version (eg master) as an argument. -ARG NODEBUILDER_VERSION=master +ARG NODEBUILDER_VERSION=v2.3.0 # Define the nodebuilder URL. ARG NODEBUILDER_URL=https://github.com/bitcoin-tools/nodebuilder/raw/${NODEBUILDER_VERSION}/nodebuilder diff --git a/nodebuilder b/nodebuilder index 76e49bf6e..8d574e510 100755 --- a/nodebuilder +++ b/nodebuilder @@ -1380,7 +1380,7 @@ print_usage() print_version() { - printf '%s\n' 'nodebuilder 2.2.0' + printf '%s\n' 'nodebuilder 2.3.0' printf '%s\n' 'Copyright (C) 2025 bitcoin-tools/nodebuilder developers' printf '%s\n' 'License: MIT-0. Details at: https://opensource.org/licenses/MIT-0' printf '%s\n' 'For support, visit: https://github.com/bitcoin-tools/nodebuilder' @@ -1587,7 +1587,7 @@ readonly TARGET_OPERATING_SYSTEM_RELEASE readonly BITCOIN_CORE_REPO='https://github.com/bitcoin/bitcoin' readonly NODEBUILDER_REPO='https://github.com/bitcoin-tools/nodebuilder' -readonly NODEBUILDER_DEPENDENCIES_TAG='master' +readonly NODEBUILDER_DEPENDENCIES_TAG='v2.3.0' readonly DEPENDENCIES_BASE_URL="${NODEBUILDER_REPO}/raw/${NODEBUILDER_DEPENDENCIES_TAG}/resources/dependencies" if [ "${TARGET_KERNEL}" = 'NetBSD' ] && is_running_in_ci; then diff --git a/test/test_nodebuilder b/test/test_nodebuilder index 8df6b7420..89d7f6054 100755 --- a/test/test_nodebuilder +++ b/test/test_nodebuilder @@ -176,7 +176,7 @@ tail_pid=$! trap 'if [ $? -eq 0 ]; then handle_exit; else handle_error; fi' EXIT readonly NODEBUILDER_REPO_URL='https://github.com/bitcoin-tools/nodebuilder' -readonly NODEBUILDER_BINARY_URL="${NODEBUILDER_REPO_URL}/raw/${GIT_REF_SHORT_NAME:-master}/nodebuilder" +readonly NODEBUILDER_BINARY_URL="${NODEBUILDER_REPO_URL}/raw/${GIT_REF_SHORT_NAME:-v2.3.0}/nodebuilder" case "${TARGET_KERNEL}" in Darwin) bitcoin_data_directory="${HOME}/Library/Application Support/Bitcoin" ;;