From b81a6068998376ad218ec2942ebfbdba3007521a Mon Sep 17 00:00:00 2001 From: greg stone Date: Fri, 27 Jan 2023 20:31:19 +0000 Subject: [PATCH 1/2] commenting out keys for now. --- docker/scratch/root-fs.Dockerfile | 14 +++++++------- release/.gitignore | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 release/.gitignore diff --git a/docker/scratch/root-fs.Dockerfile b/docker/scratch/root-fs.Dockerfile index 3529aba6..5977f669 100644 --- a/docker/scratch/root-fs.Dockerfile +++ b/docker/scratch/root-fs.Dockerfile @@ -68,13 +68,13 @@ 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/ \ - && 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/ \ - && wget https://raw.githubusercontent.com/indra-labs/indra/master/keys/херетик.asc \ - && chmod 555 херетик.asc \ - && mv херетик.asc /etc/indra/keys/ + && mv roasbeef.asc /etc/lnd/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/ \ +# && wget https://raw.githubusercontent.com/indra-labs/indra/master/keys/херетик.asc \ +# && chmod 555 херетик.asc \ +# && mv херетик.asc /etc/indra/keys/ ADD ./docker/scratch/defaults/btcd.conf . ADD ./docker/scratch/defaults/lnd.conf . diff --git a/release/.gitignore b/release/.gitignore new file mode 100644 index 00000000..fba21bb2 --- /dev/null +++ b/release/.gitignore @@ -0,0 +1 @@ +scratch-* \ No newline at end of file From 6c166ad7ea2a957921af1c11b415f079f45455e0 Mon Sep 17 00:00:00 2001 From: greg stone Date: Fri, 27 Jan 2023 20:49:35 +0000 Subject: [PATCH 2/2] getting rid of stray = in btcctl assembley file. --- docker/release/targets/btcd/btcctl.Dockerfile | 2 +- release/.gitignore | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/release/targets/btcd/btcctl.Dockerfile b/docker/release/targets/btcd/btcctl.Dockerfile index a39f251b..246b26dd 100644 --- a/docker/release/targets/btcd/btcctl.Dockerfile +++ b/docker/release/targets/btcd/btcctl.Dockerfile @@ -8,7 +8,7 @@ ARG scratch_version="latest" FROM indralabs/scratch-multi-arch:${scratch_version} ARG platform -ARG version= +ARG version ## We can't use 'COPY --from=...' here. Using ADD will enable multi-architecture releases ADD ./release/btcd-${version}/bin/${platform}/btcctl /bin diff --git a/release/.gitignore b/release/.gitignore index fba21bb2..ce19208e 100644 --- a/release/.gitignore +++ b/release/.gitignore @@ -1 +1,3 @@ -scratch-* \ No newline at end of file +scratch-* +btcd-* +lnd-*