From 43862adae57e1d22b87c2c51b28458356b4cc4ae Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 22 Mar 2022 11:49:49 +0100 Subject: [PATCH 1/3] store-secret: read up to EOF from stdin Now that we don't write a newline by ourselves, we also need to allow the EOF signal to terminate a string we're reading from stdin. --- cmd_store_secret.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd_store_secret.go b/cmd_store_secret.go index 100b56b..b9d3a47 100644 --- a/cmd_store_secret.go +++ b/cmd_store_secret.go @@ -3,6 +3,7 @@ package main import ( "bufio" "fmt" + "io" "os" "path/filepath" @@ -83,7 +84,7 @@ func (x *storeSecretCommand) Execute(args []string) error { default: log("Reading secret from stdin") secret, err := bufio.NewReader(os.Stdin).ReadString('\n') - if err != nil { + if err != nil && err != io.EOF { return fmt.Errorf("error reading secret from stdin: %v", err) } From 8c5345f94699693f9e6f070c1e5c8b43a55b97c8 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 22 Mar 2022 11:50:42 +0100 Subject: [PATCH 2/3] docker: fix default version in dev.Dockerfile --- dev.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 23568a2..9012da6 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,6 +1,6 @@ ARG GO_VERSION=1.17.6 ARG BASE_IMAGE=lightninglabs/lnd -ARG BASE_IMAGE_VERSION=0.14.2-beta +ARG BASE_IMAGE_VERSION=v0.14.2-beta FROM golang:${GO_VERSION}-alpine as builder From a79e5f98e7ebca58f8ed38348163c36d81906fad Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 22 Mar 2022 11:50:52 +0100 Subject: [PATCH 3/3] version: bump to v0.1.3-beta --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 7cfdf98..50b9c13 100644 --- a/version.go +++ b/version.go @@ -32,7 +32,7 @@ const ( AppMinor uint = 1 // AppPatch defines the application patch for this binary. - AppPatch uint = 2 + AppPatch uint = 3 // AppPreRelease MUST only contain characters from semanticAlphabet // per the semantic versioning spec.