diff --git a/docker/release/targets/btcd/btcd.Dockerfile b/docker/release/targets/btcd/btcd.Dockerfile index a6bbc461..0375df83 100644 --- a/docker/release/targets/btcd/btcd.Dockerfile +++ b/docker/release/targets/btcd/btcd.Dockerfile @@ -25,4 +25,4 @@ USER btcd:btcd # :8334 btcd RPC port EXPOSE 8333 8334 -ENTRYPOINT ["/bin/btcd", "--configfile=/etc/btcd/btcd.conf"] +ENTRYPOINT ["/bin/btcd", "--configfile=/etc/btcd/btcd.conf", "--datadir=/var/btcd"] diff --git a/docker/release/targets/btcd/docker-compose.yml b/docker/release/targets/btcd/docker-compose.yml index 6af58dd2..7a802c9b 100644 --- a/docker/release/targets/btcd/docker-compose.yml +++ b/docker/release/targets/btcd/docker-compose.yml @@ -9,23 +9,26 @@ services: indranet: ipv4_address: 172.16.42.2 command: + - "--listen=0.0.0.0:8333" + - "--rpclisten=0.0.0.0:8334" - "--rpcuser=simnet" - "--rpcpass=simnet" - "--simnet" - btcctl: - image: indralabs/btcctl - volumes: - - config:/etc/btcd:ro - networks: - indranet: - depends_on: - - btcd - command: - - "--rpcserver=172.16.42.2:8333" - - "--rpcuser=simnet" - - "--rpcpass=simnet" - - "--simnet" - - "getinfo" + - "--txindex" +# btcctl: +# image: indralabs/btcctl +# volumes: +# - config:/etc/btcd:ro +# networks: +# indranet: +# depends_on: +# - btcd +# command: +# - "--rpcserver=172.16.42.2:8333" +# - "--rpcuser=simnet" +# - "--rpcpass=simnet" +# - "--simnet" +# - "getinfo" volumes: config: data: diff --git a/docker/release/targets/btcd/scripts/btcctl b/docker/release/targets/btcd/scripts/btcctl new file mode 100755 index 00000000..6a280ce2 --- /dev/null +++ b/docker/release/targets/btcd/scripts/btcctl @@ -0,0 +1,10 @@ +#!/bin/bash + +docker run --rm -it --network=btcd_indranet \ + --volume=btcd_config:/etc/btcd:ro \ + --entrypoint="/bin/btcctl" \ + indralabs/btcctl:dev \ + -C /etc/btcd/btcctl.conf \ + --rpcserver=172.16.42.2:8334 \ + --rpcuser=simnet --rpcpass=simnet \ + --simnet $@ diff --git a/docker/scratch/defaults/btcd.conf b/docker/scratch/defaults/btcd.conf index d2542e95..bdf5712a 100644 --- a/docker/scratch/defaults/btcd.conf +++ b/docker/scratch/defaults/btcd.conf @@ -12,7 +12,7 @@ ; environment variables are typically %VARIABLE%, but they must be accessed with ; $VARIABLE here. Also, ~ is expanded to $LOCALAPPDATA on Windows. -datadir=/var/btcd +;datadir=/var/btcd logdir=/var/btcd diff --git a/docker/scratch/root-fs.Dockerfile b/docker/scratch/root-fs.Dockerfile index 5977f669..3b460fd8 100644 --- a/docker/scratch/root-fs.Dockerfile +++ b/docker/scratch/root-fs.Dockerfile @@ -68,7 +68,10 @@ RUN set -ex && echo "adding keys to verify btcd/lnd releases" \ && mv guggero.asc /etc/btcd/keys/ \ && wget https://raw.githubusercontent.com/lightningnetwork/lnd/master/scripts/keys/roasbeef.asc \ && chmod 555 roasbeef.asc \ - && mv roasbeef.asc /etc/lnd/keys/ + && mv roasbeef.asc /etc/lnd/keys/ \ + && wget https://opensource.conformal.com/GIT-GPG-KEY-conformal.txt \ + && chmod 555 GIT-GPG-KEY-conformal.txt \ + && mv GIT-GPG-KEY-conformal.txt /etc/btcd/keys/ # && wget https://raw.githubusercontent.com/indra-labs/indra/master/keys/greg.stone.asc \ # && chmod 555 greg.stone.asc \ # && mv greg.stone.asc /etc/indra/keys/ \ diff --git a/docker/sim/docker-compose-dev.yml b/docker/sim/docker-compose-dev.yml index 7998c505..5b031d63 100644 --- a/docker/sim/docker-compose-dev.yml +++ b/docker/sim/docker-compose-dev.yml @@ -20,6 +20,7 @@ services: - "--rpcuser=simnet" - "--rpcpass=simnet" - "--simnet" + - "--txindex" seed0: sysctls: - "net.ipv6.conf.all.disable_ipv6=0" diff --git a/docker/sources/btcwallet/official.Dockerfile b/docker/sources/btcwallet/official.Dockerfile new file mode 100644 index 00000000..7cdb1809 --- /dev/null +++ b/docker/sources/btcwallet/official.Dockerfile @@ -0,0 +1,46 @@ +# --- +# Build Process +# --- + +ARG sourcing_image="golang" + +FROM indralabs/scratch:latest as scratch + +FROM ${sourcing_image} as source + +ARG source_url="https://github.com/btcsuite/btcd/releases/download" +ARG source_version="v0.23.3" + +WORKDIR /tmp + +RUN set -ex echo "downloading source and binaries with manifest and signature." \ + && wget ${source_url}/${source_version}/manifest-${source_version}.txt \ + && wget ${source_url}/${source_version}/manifest-guggero-${source_version}.sig \ + && wget ${source_url}/${source_version}/btcd-source-${source_version}.tar.gz + +# Importing keys from scratch +COPY --from=scratch /etc/btcd/keys/guggero.asc /tmp/guggero.asc + +RUN set -ex echo "importing keys" \ + && cat guggero.asc | gpg --import + +RUN set -ex echo "running signature verification on manifest" \ + && gpg --verify manifest-guggero-${source_version}.sig manifest-${source_version}.txt + +RUN set -ex echo "verifying checksum on btcd-source-${source_version}.tar.gz" \ + && cat manifest-${source_version}.txt | grep btcd-source-${source_version}.tar.gz | shasum -a 256 -c + +RUN set -ex echo "untarring binaries and source code" \ + && mv btcd-source-${source_version}.tar.gz /tmp/btcd-source.tar.gz \ + && mkdir -pv /tmp/btcd-source \ + && tar -xzvf btcd-source.tar.gz --directory /tmp/btcd-source + +WORKDIR /tmp/btcd-source + +RUN set -ex echo "downloading modules" \ + && go mod vendor + +FROM scratch + +COPY --from=source /tmp/btcd-source /source +COPY --from=source /tmp/btcd-source.tar.gz /source.tar.gz \ No newline at end of file diff --git a/release/.gitignore b/release/.gitignore index ce19208e..7394a73a 100644 --- a/release/.gitignore +++ b/release/.gitignore @@ -1,3 +1,4 @@ scratch-* btcd-* lnd-* +indra-* \ No newline at end of file