From 7865384e859447909d782e84997152ceaab37c42 Mon Sep 17 00:00:00 2001 From: 3np <3np> Date: Mon, 28 Feb 2022 20:53:47 +0100 Subject: [PATCH] docker: add git_url build-arg --- Dockerfile | 3 ++- docs/DOCKER.md | 8 +++++++- docs/release-notes/release-notes-0.15.0.md | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92782a85f..9f0048e48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,13 +14,14 @@ ENV GODEBUG netdns=cgo # image to be built from a specified Git state. The default image # will use the Git tip of master by default. ARG checkout="master" +ARG git_url="https://github.com/lightningnetwork/lnd" # Install dependencies and build the binaries. RUN apk add --no-cache --update alpine-sdk \ git \ make \ gcc \ -&& git clone https://github.com/lightningnetwork/lnd /go/src/github.com/lightningnetwork/lnd \ +&& git clone $git_url /go/src/github.com/lightningnetwork/lnd \ && cd /go/src/github.com/lightningnetwork/lnd \ && git checkout $checkout \ && make release-install diff --git a/docs/DOCKER.md b/docs/DOCKER.md index 61abb7a18..37d5534e7 100644 --- a/docs/DOCKER.md +++ b/docs/DOCKER.md @@ -115,7 +115,7 @@ To test the Docker production image locally, run the following from the project ⛰ docker build . -t myrepository/lnd:master ``` -To choose a specific [branch](https://github.com/lightningnetwork/lnd/branches) or [tag](https://hub.docker.com/r/lightninglabs/lnd/tags?page=1&ordering=last_updated) instead, use the "checkout" build-arg. For example, to build the latest tagged commit: +To choose a specific [branch](https://github.com/lightningnetwork/lnd/branches) or [tag](https://hub.docker.com/r/lightninglabs/lnd/tags?page=1&ordering=last_updated) instead, use the `checkout` build-arg. For example, to build the latest tagged commit: ```shell ⛰ docker build . --build-arg checkout=v0.14.1-beta -t myrepository/lnd:v0.14.1-beta @@ -127,6 +127,12 @@ To build the image using the most current tag: ⛰ docker build . --build-arg checkout=$(git describe --tags `git rev-list --tags --max-count=1`) -t myrepository/lnd:latest-tag ``` +You can also specify a different repo than the default (`https://github.com/lightningnetwork/lnd`) using the `git_url` build-arg: + +```shell +⛰ docker build . --build-arg git_url=https://git.example.com/lnd.git --build-arg checkout=mybranch -t myrepository/lnd:v0.13.0-beta +``` + Once the image has been built and tagged locally, start the container: ```shell diff --git a/docs/release-notes/release-notes-0.15.0.md b/docs/release-notes/release-notes-0.15.0.md index 301f41e02..817241740 100644 --- a/docs/release-notes/release-notes-0.15.0.md +++ b/docs/release-notes/release-notes-0.15.0.md @@ -69,6 +69,8 @@ * [The `tlv` package was refactored into its own Golang submodule](https://github.com/lightningnetwork/lnd/pull/6283). +* [Source repository can now be specified for Docker image builds](https://github.com/lightningnetwork/lnd/pull/6300) + ## RPC Server * [Add value to the field