From 4f7f4f7d27eba23d37648e8fb095f06014e674d3 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:20:42 -0500 Subject: [PATCH 01/12] Update Bitcoin container to v28.0 --- bitcoin-core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin-core/Dockerfile b/bitcoin-core/Dockerfile index 1d3ced9..8496b98 100644 --- a/bitcoin-core/Dockerfile +++ b/bitcoin-core/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim AS install ARG VRS -ENV VERSION=${VRS:-23.0} +ENV VERSION=${VRS:-28.0} RUN echo $VERSION RUN apt update && apt install -y wget gpg From 6936f317d8298ad8979310ed1bc5ec47e452cbfa Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:24:19 -0500 Subject: [PATCH 02/12] Use Debian stable as base instead of bullseye --- bitcoin-core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin-core/Dockerfile b/bitcoin-core/Dockerfile index 8496b98..41562e0 100644 --- a/bitcoin-core/Dockerfile +++ b/bitcoin-core/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim AS install +FROM debian:stable-slim AS install ARG VRS ENV VERSION=${VRS:-28.0} From 654ae98c70b078aee42b912fbbcd6fb1b38732c6 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:25:59 -0500 Subject: [PATCH 03/12] Use Debian stable instead of bullseye --- bitcoin-core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin-core/Dockerfile b/bitcoin-core/Dockerfile index 41562e0..b041bc5 100644 --- a/bitcoin-core/Dockerfile +++ b/bitcoin-core/Dockerfile @@ -20,7 +20,7 @@ RUN sha256sum --ignore-missing --check SHA256SUMS RUN tar xzf bitcoin-$VERSION-x86_64-linux-gnu.tar.gz RUN install -m 0755 -o root -g root -t /usr/bin bitcoin-$VERSION/bin/* -FROM debian:bullseye-slim +FROM debian:stable-slim COPY --from=install /usr/bin/bitcoind /usr/bin/bitcoind COPY --from=install /usr/bin/bitcoin-cli /usr/bin/bitcoin-cli From 7f77efade79ef6a79c4977a44dde650feef0393b Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:27:15 -0500 Subject: [PATCH 04/12] Update doc to show version 28.0 --- bitcoin-core/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bitcoin-core/README.md b/bitcoin-core/README.md index dbb7fbc..517f41c 100644 --- a/bitcoin-core/README.md +++ b/bitcoin-core/README.md @@ -5,12 +5,12 @@ Build the default bitcoin-core image with ``` -docker build -t bitcoin-core:23.0 . +docker build -t bitcoin-core:28.0 . ``` Available `build-arg`: -- **VRS**: bitcoin-core version to install, default _23.0_ +- **VRS**: bitcoin-core version to install, default _28.0_ Create a container with exposed ports for RPC and P2P connections @@ -18,7 +18,7 @@ Create a container with exposed ports for RPC and P2P connections docker create -p 18443:18443 -p 18444:18444\ --env NETWORK=regtest\ --name bitcoind\ - bitcoin-core:23.0 + bitcoin-core:28.0 ``` The bitcoin datadir is in the `/data` volume and can be accessed by addtionally passing for example `-v /path/to/host/folder:data` to `docker create` or create a named volume with `docker volume create --name bitcoind-data` and use the flag `-v bitcoind-data:/data`. @@ -43,7 +43,7 @@ Add a service named `bitcoind` with a named volume `bitcoind-data` mounted on `/ ```yaml services: bitcoind: - image: ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 + image: ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 env: NETWORK: regtest volumes: @@ -60,14 +60,14 @@ You probably also want to run the job in a container to bind the same named volu Pull the image, create a named volume, and finally create the container (here named `bitcoind`). ``` -docker pull ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 +docker pull ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 mkdir data docker create -p 18443:18443 -p 18444:18444\ --name bitcoind\ --env NETWORK=regtest\ -v $(pwd)/data:/data\ - ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 + ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 docker start bitcoind sudo cat data/regtest/.cookie From 8e7db501ec5cf11cedba2e33aa05d3c5d7137eb4 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:29:24 -0500 Subject: [PATCH 05/12] Update Electrs container - Update Electrs to latest release 0.10.7 - Update Debian to use stable as base instead of bullseye --- electrs/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electrs/Dockerfile b/electrs/Dockerfile index 52bade2..73c8f1f 100644 --- a/electrs/Dockerfile +++ b/electrs/Dockerfile @@ -1,7 +1,7 @@ FROM rust:latest AS install ARG VRS -ENV VERSION=${VRS:-v0.9.9} +ENV VERSION=${VRS:-v0.10.7} RUN echo $VERSION RUN apt update && apt install -y clang cmake @@ -12,7 +12,7 @@ WORKDIR /electrs RUN cargo build --release --bin electrs -FROM debian:bullseye-slim +FROM debian:stable-slim COPY --from=install /electrs/target/release/electrs /usr/bin/electrs From 9d6b72b9395274ca946d85e8abf93c89baa88849 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:29:50 -0500 Subject: [PATCH 06/12] Update VERSION to 28.0 --- bitcoin-core/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin-core/VERSION b/bitcoin-core/VERSION index 919c868..ba70ecb 100644 --- a/bitcoin-core/VERSION +++ b/bitcoin-core/VERSION @@ -1 +1 @@ -23.0 +28.0 From 59d1b3bd6354c7ba253cb1f85ad7e3d10413003f Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:30:14 -0500 Subject: [PATCH 07/12] Update VERSION to 0.10.7 --- electrs/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electrs/VERSION b/electrs/VERSION index 7e310ba..2d993c4 100644 --- a/electrs/VERSION +++ b/electrs/VERSION @@ -1 +1 @@ -0.9.9 +0.10.7 From b67ef269e7ac27d0c079068c82b60e810ef5c68c Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:31:42 -0500 Subject: [PATCH 08/12] Update docs to use new versions --- electrs/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/electrs/README.md b/electrs/README.md index 596ac54..7c1268e 100644 --- a/electrs/README.md +++ b/electrs/README.md @@ -3,12 +3,12 @@ Build the default electrs image with ``` -docker build -t electrs:0.9.9 . +docker build -t electrs:0.10.7 . ``` Available `build-arg`: -- **VRS**: electrs version to install, default _v0.9.9_ +- **VRS**: electrs version to install, default _v0.10.7_ Create a container with exposed ports for RPC connections (you need a `bitcoind` container created to link with) @@ -21,7 +21,7 @@ docker create -p 60401:60401\ --name electrs\ --volumes-from bitcoind\ --link bitcoind\ - electrs:0.9.9 + electrs:0.10.7 ``` The bitcoin _datadir_ is expected to be in the `/data` volume and can be accessed by addtionally passing for example `-v /path/to/host/folder:data` to `docker create` or `--volumes-from bitcoind`. Additionally, to access bitcoind's rpc running in another container, pass in a `--link ` argument with the name of the bitcoind container. @@ -44,13 +44,13 @@ Available listening container ports: ```yaml services: bitcoind: - image: ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 + image: ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 env: NETWORK: regtest volumes: - bitcoind-data:/data electrs: - image: ghcr.io/unstoppableswap/containers/electrs:0.9.9 + image: ghcr.io/unstoppableswap/containers/electrs:0.10.7 env: NETWORK: regtest DAEMON_RPC_ADDR: bitcoind:18443 @@ -63,15 +63,15 @@ services: ## Standalone usage with [`containers/bitcoin-core`](https://github.com/unstoppableswap/containers/tree/main/bitcoin-core) image ``` -docker pull ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 -docker pull ghcr.io/unstoppableswap/containers/electrs:0.9.9 +docker pull ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 +docker pull ghcr.io/unstoppableswap/containers/electrs:0.10.7 docker volume create --name bitcoind-data docker create -p 18443:18443 -p 18444:18444\ --name bitcoind\ --env NETWORK=regtest\ -v bitcoind-data:/data\ - ghcr.io/unstoppableswap/containers/bitcoin-core:23.0 + ghcr.io/unstoppableswap/containers/bitcoin-core:28.0 docker create -p 60401:60401\ --name electrs\ @@ -81,7 +81,7 @@ docker create -p 60401:60401\ --env NETWORK=regtest\ --volumes-from bitcoind\ --link bitcoind\ - ghcr.io/unstoppableswap/containers/electrs:0.9.9 + ghcr.io/unstoppableswap/containers/electrs:0.10.7 docker start bitcoind docker start electrs From 83f9556a418bcf4be3135d561deb763cf8808c34 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:33:03 -0500 Subject: [PATCH 09/12] Update container - Update Monero version to 0.18.3.4 - Use Debian stable as base instead of bullseye --- monero-wallet-rpc/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monero-wallet-rpc/Dockerfile b/monero-wallet-rpc/Dockerfile index f9ba360..abfbe5d 100644 --- a/monero-wallet-rpc/Dockerfile +++ b/monero-wallet-rpc/Dockerfile @@ -1,7 +1,7 @@ -FROM debian:bullseye-slim AS install +FROM debian:stable-slim AS install ARG VRS -ENV VERSION=${VRS:-v0.18.2.2} +ENV VERSION=${VRS:-v0.18.3.4} RUN echo $VERSION RUN apt update && apt install -y wget tar bzip2 @@ -14,7 +14,7 @@ RUN echo "$(head -n 1 ./SHASUM) monero-linux-x64-$VERSION.tar.bz2" | sha256sum - RUN tar xf monero-linux-x64-$VERSION.tar.bz2 RUN install -m 0755 -o root -g root -t /usr/bin monero-x86_64-linux-gnu-$VERSION/monero* -FROM debian:bullseye-slim +FROM debian:stable-slim COPY --from=install /usr/bin/monero-wallet* /usr/bin/ From d973b9cecd1ba2b8f632dfd024043608aaed69a4 Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:34:33 -0500 Subject: [PATCH 10/12] Update docs to show new version --- monero-wallet-rpc/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/monero-wallet-rpc/README.md b/monero-wallet-rpc/README.md index 98a9a75..b586ba3 100644 --- a/monero-wallet-rpc/README.md +++ b/monero-wallet-rpc/README.md @@ -3,12 +3,12 @@ Build the default monero-wallet-rpc image with ``` -docker build -t monero-wallet-rpc:0.18.2.2 . +docker build -t monero-wallet-rpc:0.18.3.4 . ``` Available `build-arg`: -- **VRS**: monero-wallet-rpc version to install, default _0.18.2.2_ +- **VRS**: monero-wallet-rpc version to install, default _0.18.3.4_ Create a container with exposed ports for RPC connections (you need a `monerod` container created to link with) @@ -18,7 +18,7 @@ docker create -p 18083:18083\ --env MONERO_DAEMON_ADDRESS=monerod:18081\ --env WALLET_RPC_PORT=18083\ --link monerod\ - monero-wallet-rpc:0.18.2.2 + monero-wallet-rpc:0.18.3.4 ``` Available environment variables: @@ -32,20 +32,20 @@ Available listening container ports: Wallet RPC is binded to `0.0.0.0` and the chosen **WALLET_RPC_PORT**, you probably want to expose the chosen port outside the container with `-p [hostPort]:[containerPort]`. -The `monero-wallet-cli` binary is also installed, you can use `docker run -it ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.2.2 /bin/bash` to use it stand alone or `docker exec -it {monero-wallet-rcp} /bin/bash` to enter a running container. +The `monero-wallet-cli` binary is also installed, you can use `docker run -it ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.3.4 /bin/bash` to use it stand alone or `docker exec -it {monero-wallet-rcp} /bin/bash` to enter a running container. ## GitHub Action usage ```yaml services: monerod: - image: ghcr.io/unstoppableswap/containers/monerod:0.18.2.2 + image: ghcr.io/unstoppableswap/containers/monerod:0.18.3.4 env: NETWORK: regtest OFFLINE: --offline DIFFICULTY: 1 monero-wallet-rpc: - image: ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.2.2 + image: ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.3.4 env: MONERO_DAEMON_ADDRESS: monerod:18081 WALLET_RPC_PORT: 18083 @@ -54,22 +54,22 @@ services: ## Standalone usage with [`containers/monerod`](https://github.com/unstoppableswap/containers/tree/main/monerod) image ``` -docker pull ghcr.io/unstoppableswap/containers/monerod:0.18.2.2 -docker pull ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.2.2 +docker pull ghcr.io/unstoppableswap/containers/monerod:0.18.3.4 +docker pull ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.3.4 docker create -p 18080:18080 -p 18081:18081 -p 18082:18082\ --name monerod\ --env NETWORK=regtest\ --env OFFLINE=--offline\ --env DIFFICULTY=1\ - ghcr.io/unstoppableswap/containers/monerod:0.18.2.2 + ghcr.io/unstoppableswap/containers/monerod:0.18.3.4 docker create -p 18083:18083\ --name monero-wallet-rpc\ --link monerod\ --env MONERO_DAEMON_ADDRESS=monerod:18081\ --env WALLET_RPC_PORT=18083\ - ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.2.2 + ghcr.io/unstoppableswap/containers/monero-wallet-rpc:0.18.3.4 docker start monerod docker start monero-wallet-rpc From d3d3c45c5eb61f678cde7d75a2ec064d6abebd9c Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:36:11 -0500 Subject: [PATCH 11/12] Update SHASUM --- monero-wallet-rpc/SHASUM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monero-wallet-rpc/SHASUM b/monero-wallet-rpc/SHASUM index 078f126..8ea1e7c 100644 --- a/monero-wallet-rpc/SHASUM +++ b/monero-wallet-rpc/SHASUM @@ -1 +1 @@ -186800de18f67cca8475ce392168aabeb5709a8f8058b0f7919d7c693786d56b +51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d From ba2be242a7fa7e1df67dbe72a5545f3e92c84cba Mon Sep 17 00:00:00 2001 From: darkness-su Date: Sat, 16 Nov 2024 12:36:26 -0500 Subject: [PATCH 12/12] Update VERSION --- monero-wallet-rpc/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monero-wallet-rpc/VERSION b/monero-wallet-rpc/VERSION index 01768a7..7dafdb0 100644 --- a/monero-wallet-rpc/VERSION +++ b/monero-wallet-rpc/VERSION @@ -1 +1 @@ -0.18.2.2 +0.18.3.4