diff --git a/docker/release/targets/btcd/docker-compose.yml b/docker/release/targets/btcd/docker-compose.yml index ea0d4852..e5f2dc0f 100644 --- a/docker/release/targets/btcd/docker-compose.yml +++ b/docker/release/targets/btcd/docker-compose.yml @@ -25,25 +25,27 @@ services: networks: indranet: ipv4_address: 172.16.42.3 + depends_on: + - btcd command: - "--simnet" - "--rpcconnect=172.16.42.2:8334" - "--username=simnet" - "--password=simnet" - btcctl: - image: indralabs/btcctl-multi-arch:linux-amd64-dev - volumes: - - config:/etc/btcd:ro - networks: - indranet: - depends_on: - - btcwallet - command: - - "--rpcserver=172.16.42.2:8334" - - "--rpcuser=simnet" - - "--rpcpass=simnet" - - "--simnet" - - "generate 1" +# btcctl: +# image: indralabs/btcctl-multi-arch:linux-amd64-dev +# volumes: +# - config:/etc/btcd:ro +# networks: +# indranet: +# depends_on: +# - btcwallet +# command: +# - "--rpcserver=172.16.42.2:8334" +# - "--rpcuser=simnet" +# - "--rpcpass=simnet" +# - "--simnet" +# - "generate 1" volumes: config: data: diff --git a/docker/release/targets/btcd/scripts/btcctl b/docker/release/targets/btcd/scripts/btcctl index 6a280ce2..54ddc7b3 100755 --- a/docker/release/targets/btcd/scripts/btcctl +++ b/docker/release/targets/btcd/scripts/btcctl @@ -2,9 +2,7 @@ docker run --rm -it --network=btcd_indranet \ --volume=btcd_config:/etc/btcd:ro \ - --entrypoint="/bin/btcctl" \ - indralabs/btcctl:dev \ - -C /etc/btcd/btcctl.conf \ + indralabs/btcctl-multi-arch:linux-amd64-dev \ --rpcserver=172.16.42.2:8334 \ --rpcuser=simnet --rpcpass=simnet \ --simnet $@ diff --git a/docker/release/targets/btcd/scripts/btcctl-wallet b/docker/release/targets/btcd/scripts/btcctl-wallet old mode 100644 new mode 100755 index 902c1f87..181cb395 --- a/docker/release/targets/btcd/scripts/btcctl-wallet +++ b/docker/release/targets/btcd/scripts/btcctl-wallet @@ -1,6 +1,6 @@ #!/bin/bash -docker run --rm -it --network=btcd_indranet \  ✔ +docker run --rm -it --network=btcd_indranet \ --volume=btcd_btcwallet_config:/etc/btcwallet:ro \ --volume=btcd_btcwallet_data:/var/btcwallet \ indralabs/btcctl-multi-arch:linux-amd64-dev \ diff --git a/docker/release/targets/btcd/setup.sh b/docker/release/targets/btcd/setup.sh new file mode 100755 index 00000000..82d37e99 --- /dev/null +++ b/docker/release/targets/btcd/setup.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +docker rm btcd-btcd-1 btcd-btcctl-1 btcd-btcwallet-1 2>/dev/null + +docker volume rm btcd_config btcd_data btcd_btcwallet_config btcd_btcwallet_data 2>/dev/null + +docker run --rm -it \ + --volume=btcd_btcwallet_config:/etc/btcwallet \ + --entrypoint="/bin/gencerts" \ + --user=8332:8332 \ + indralabs/btcd-multi-arch:linux-amd64-dev \ + --directory=/etc/btcwallet -H 172.16.42.3 -f + +docker run --rm -it \ + --volume=btcd_btcwallet_config:/etc/btcwallet \ + --volume=btcd_btcwallet_data:/var/btcwallet \ + indralabs/btcwallet-multi-arch:linux-amd64-dev \ + --simnet --create + diff --git a/docker/scratch/root-fs.Dockerfile b/docker/scratch/root-fs.Dockerfile index d3fa8ab6..e96ccfcf 100644 --- a/docker/scratch/root-fs.Dockerfile +++ b/docker/scratch/root-fs.Dockerfile @@ -59,7 +59,7 @@ RUN set -ex && echo "checking users and groups to root filesystem" \ RUN set -ex && echo "adding and permissioning /etc directories" \ && mkdir -pv /etc/btcwallet && chmod 755 /etc/btcwallet && chown btcwallet:btcwallet /etc/btcwallet \ && mkdir -pv /etc/btcd && chmod 755 /etc/btcd \ - && mkdir -pv /etc/btcd/keys && chmod 750 /etc/btcd/keys && chown btcd:btcd /etc/btcd/keys \ + && mkdir -pv /etc/btcd/keys && chmod 755 /etc/btcd/keys && chown btcd:btcd /etc/btcd/keys \ && mkdir -pv /etc/lnd && chmod 755 /etc/lnd \ && mkdir -pv /etc/lnd/keys && chmod 750 /etc/lnd/keys && chown lnd:lnd /etc/lnd/keys \ && mkdir -pv /etc/lnd/macaroons && chmod 750 /etc/lnd/macaroons && chown lnd:lnd /etc/lnd/macaroons \