From cd49a21735a9c688cef39da3fb34845e19558d9b Mon Sep 17 00:00:00 2001 From: ZZiigguurraatt Date: Thu, 5 Dec 2024 18:06:31 -0500 Subject: [PATCH 1/2] dev.Dockerfile: allow forcing a specific taproot-assets version through a build argument --- dev.Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 5a70f97a0..9ff73c2bc 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -23,10 +23,18 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g # queries required to connect to linked containers succeed. ENV GODEBUG netdns=cgo +# allow forcing a specific taproot-assets version through a build argument +# see https://go.dev/ref/mod#version-queries for the types of queries that can be used to define a version +ARG TAPROOT_ASSETS_VERSION + # Install dependencies and install/build lightning-terminal. -RUN apk add --no-cache --update alpine-sdk \ - make \ +RUN apk add --no-cache --update alpine-sdk make \ && cd /go/src/github.com/lightninglabs/lightning-terminal \ + # if custom taproot-assets version supplied, apply it + && if [ -n "$TAPROOT_ASSETS_VERSION" ]; then \ + go get -v github.com/lightninglabs/taproot-assets@$TAPROOT_ASSETS_VERSION \ + && go mod tidy; \ + fi \ && make go-install \ && make go-install-cli From e192d1e7fd572594d9e9271b28aba03213e0f3b3 Mon Sep 17 00:00:00 2001 From: ZZiigguurraatt Date: Wed, 11 Dec 2024 12:31:54 -0500 Subject: [PATCH 2/2] dev.Dockerfile: fix comment style --- dev.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 9ff73c2bc..3b590892d 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -23,8 +23,9 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g # queries required to connect to linked containers succeed. ENV GODEBUG netdns=cgo -# allow forcing a specific taproot-assets version through a build argument -# see https://go.dev/ref/mod#version-queries for the types of queries that can be used to define a version +# Allow forcing a specific taproot-assets version through a build argument. +# Please see https://go.dev/ref/mod#version-queries for the types of +# queries that can be used to define a version. ARG TAPROOT_ASSETS_VERSION # Install dependencies and install/build lightning-terminal.