Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update containers #1

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
6 changes: 3 additions & 3 deletions bitcoin-core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:bullseye-slim AS install
FROM debian:stable-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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions bitcoin-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
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

```
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`.
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bitcoin-core/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23.0
28.0
4 changes: 2 additions & 2 deletions electrs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
18 changes: 9 additions & 9 deletions electrs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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 <container>` argument with the name of the bitcoind container.
Expand All @@ -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
Expand All @@ -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\
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion electrs/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.9
0.10.7
6 changes: 3 additions & 3 deletions monero-wallet-rpc/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/

Expand Down
20 changes: 10 additions & 10 deletions monero-wallet-rpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monero-wallet-rpc/SHASUM
Original file line number Diff line number Diff line change
@@ -1 +1 @@
186800de18f67cca8475ce392168aabeb5709a8f8058b0f7919d7c693786d56b
51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d
2 changes: 1 addition & 1 deletion monero-wallet-rpc/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.18.2.2
0.18.3.4