From fdbd4da7715fd86c2cb717251e884814a26d8d72 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 17 Feb 2021 16:58:29 +0100 Subject: [PATCH] make: use make for docker-release To fix an issue where the golang version would be picked up from the host system if the docker-release command was used, we switch over to using make inside of the container as well instead of feeding the parameters into the release script manually. We only pass in the flags that we might actually want to overwrite. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eef8a400..0abfd631 100644 --- a/Makefile +++ b/Makefile @@ -157,13 +157,15 @@ release: clean-mobile $(VERSION_CHECK) ./scripts/release.sh build-release "$(VERSION_TAG)" "$(BUILD_SYSTEM)" "$(RELEASE_TAGS)" "$(RELEASE_LDFLAGS)" -docker-release: clean-mobile +docker-release: @$(call print, "Building release helper docker image.") if [ "$(tag)" = "" ]; then echo "Must specify tag=!"; exit 1; fi docker build -t lnd-release-helper -f make/builder.Dockerfile make/ - $(DOCKER_RELEASE_HELPER) scripts/release.sh check-tag "$(VERSION_TAG)" - $(DOCKER_RELEASE_HELPER) scripts/release.sh build-release "$(VERSION_TAG)" "$(BUILD_SYSTEM)" "$(RELEASE_TAGS)" "$(RELEASE_LDFLAGS)" + + # Run the actual compilation inside the docker image. We pass in all flags + # that we might want to overwrite in manual tests. + $(DOCKER_RELEASE_HELPER) make release tag="$(tag)" sys="$(sys)" COMMIT="$(COMMIT)" COMMIT_HASH="$(COMMIT_HASH)" scratch: build