Merge branch 'ind-bootstrap' into protocol

# Conflicts:
#	version.go

cmd/docker/release/main.go

@@ -34,29 +34,11 @@ var (
 func strPtr(str string) *string { return &str }
 
 var buildConfigurations = []docker.BuildConfiguration{
-	//docker.BuildConfiguration{
-	//	Name:            defaultRepositoryName + "/" + "scratch",
-	//	ContextFilePath: "/tmp/scratch.tar",
-	//	BuildOpts: types.ImageBuildOptions{
-	//		Dockerfile: "docker/scratch/Dockerfile",
-	//		Tags: []string{
-	//			indra.SemVer,
-	//			"latest",
-	//		},
-	//		BuildArgs: map[string]*string{
-	//			"base_image": strPtr("busybox"),
-	//		},
-	//		SuppressOutput: false,
-	//		Remove:         true,
-	//		ForceRemove:    true,
-	//		PullParent:     true,
-	//	},
-	//},
 	docker.BuildConfiguration{
 		Name:            defaultRepositoryName + "/" + "btcd",
 		ContextFilePath: "/tmp/btcd.tar",
 		BuildOpts: types.ImageBuildOptions{
-			Dockerfile: "docker/btcd/Dockerfile",
+			Dockerfile: "docker/btcd/btcd.Dockerfile",
 			Tags: []string{
 				"v0.23.4",
 				"latest",
@@ -75,6 +57,25 @@ var buildConfigurations = []docker.BuildConfiguration{
 			PullParent:     true,
 		},
 	},
+
+	docker.BuildConfiguration{
+		Name:            defaultRepositoryName + "/" + "btcctl",
+		ContextFilePath: "/tmp/btcctl.tar",
+		BuildOpts: types.ImageBuildOptions{
+			Dockerfile: "docker/btcd/btcctl.Dockerfile",
+			Tags: []string{
+				"v0.23.4",
+				"latest",
+			},
+			BuildArgs: map[string]*string{
+				"semver": strPtr("v0.23.4"),
+			},
+			SuppressOutput: false,
+			Remove:         true,
+			ForceRemove:    true,
+			PullParent:     false,
+		},
+	},
 	//docker.BuildConfiguration{
 	//	Name:            defaultRepositoryName + "/" + "lnd",
 	//	ContextFilePath: "/tmp/lnd.tar",
@@ -85,9 +86,12 @@ var buildConfigurations = []docker.BuildConfiguration{
 	//			"latest",
 	//		},
 	//		BuildArgs: map[string]*string{
+	//			"base_image":   strPtr(defaultBuildContainer),
+	//			"target_image": strPtr("indralabs/scratch:latest"),
 	//			// This argument is the tag fetched by git
 	//			// It MUST be updated alongside the tag above
-	//			"git_tag": strPtr("v0.15.5-beta"),
+	//			"git_repository": strPtr("github.com/lightningnetwork/lnd"),
+	//			"git_tag":        strPtr("v0.15.5-beta"),
 	//		},
 	//		SuppressOutput: false,
 	//		Remove:         true,

docker/btcd/btcctl.Dockerfile

@@ -0,0 +1,6 @@
+
+ARG semver=master
+
+FROM indralabs/btcd:${semver}
+
+ENTRYPOINT ["/bin/btcctl", "--configfile=/etc/btcd/btcd.conf", "--rpccert=/etc/btcd/keys/rpc.cert"]

docker/btcd/btcd.Dockerfile

@@ -40,7 +40,6 @@ RUN set -ex \
 FROM indralabs/scratch:latest
 
 ## Migrate the binaries and storage folder
-
 COPY --from=builder /tmp/btcd.conf /etc/btcd/btcd.conf
 COPY --from=builder /tmp/bin /bin
 

docker/lnd/Dockerfile

@@ -1,30 +1,23 @@
-FROM golang:1.19.4 AS builder
 
-# User/Group definition
-ENV USER=lnd GROUP=lnd UID=9735 GID=9735
+ARG base_image="golang"
+ARG target_image="indralabs/scratch"
 
-## Create a user/group for indra, to be migrated to the target container
-RUN addgroup ${GROUP} --gid ${GID} \
- && adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/var/lnd" \
-    --shell "/sbin/nologin" \
-    #--no-create-home \
-    --uid "${UID}" \
-    --gid "${GID}" \
-    "${USER}" \
- && mkdir -pv /var/lnd/.lnd && chown -R lnd:lnd /var/lnd
+# ---
+# Build Process
+# ---
 
-# Pass a tag, branch or a commit using build-arg.  This allows a docker
-# image to be built from a specified Git state.  The default image
-# will use the Git tip of master by default.
+FROM ${base_image} AS builder
+
+# Get the repo and build
+ARG git_repository="github.com/indra-labs/lnd"
 ARG git_tag="master"
 
 # Install dependencies and build the binaries.
-RUN git clone "https://github.com/lightningnetwork/lnd" /go/src/github.com/lightningnetwork/lnd \
-&&  cd /go/src/github.com/lightningnetwork/lnd \
-&&  git checkout ${git_tag}
+RUN git clone "https://"${git_repository} /go/src/${git_repository}
+
+WORKDIR $GOPATH/src/${git_repository}
+
+RUN git checkout ${git_tag}
 
 # Source/Target release defaults
 ARG ARCH=amd64
@@ -32,27 +25,23 @@ ARG GOARCH=amd64
 
 ENV GO111MODULE=on GOOS=linux
 
-WORKDIR $GOPATH/src/github.com/lightningnetwork/lnd
+WORKDIR $GOPATH/src/${git_repository}
+
+RUN cp sample-lnd.conf /tmp/lnd.conf
 
 RUN set -ex \
-  && cp /go/src/github.com/lightningnetwork/lnd/sample-lnd.conf /var/lnd/.lnd/lnd.conf \
-  && chown -R lnd:lnd /var/lnd \
-  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /bin/lnd ./cmd/lnd/. \
-  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /bin/lncli ./cmd/lncli/.
+  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/lnd ./cmd/lnd/. \
+  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/lncli ./cmd/lncli/.
 
 # ---
 # Configure and Build the target container
 # ---
 
-FROM scratch
+FROM indralabs/scratch:latest
 
-# Migrate User/Group to target
-COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder /etc/group /etc/group
-
-# Migrate the binaries and storage folder
-COPY --from=builder /bin /bin
-COPY --from=builder --chown=lnd:lnd /var/lnd /var/lnd
+## Migrate the binaries and storage folder
+COPY --from=builder /tmp/lnd.conf /etc/lnd/lnd.conf
+COPY --from=builder /tmp/bin /bin
 
 # Enable the indra user
 USER lnd:lnd
@@ -61,12 +50,14 @@ USER lnd:lnd
 # ENV IND_LOGFILEPATH=""
 
 # Set the data volume
-#VOLUME ["/var/lnd"]
+# VOLUME ["/etc/lnd"]
+# VOLUME ["/var/lnd"]
 
 # :9735  lnd peer-to-peer port
 # :10009  lnd RPC port
 EXPOSE 9735 10009
 
-ENTRYPOINT ["/bin/lnd"]
+ENTRYPOINT ["/bin/lnd", "--lnddir=/var/lnd", "--configfile=/etc/lnd/lnd.conf", "--datadir=/var/lnd", "--tlskeypath=/etc/lnd/keys/", "--tlscertpath=/etc/lnd/keys/", "--btcd.rpccert=/etc/btcd/keys/rpc.cert", "--bitcoin.active"]
+CMD ["--bitcoin.mainnet"]
 
 # docker run -it --rm --entrypoint="/bin/lncli" -v ~/rpc.cert:/var/lnd/.lnd/rpc.cert indralabs/lnd --skipverify -s <host>:<port> -u <username> -P <password> <function>