mirror of
https://github.com/docker/docker-install.git
synced 2026-11-20 10:03:11 +03:00
Change enbsubst to substitute for new COMMIT_SHA var
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
This commit is contained in:
2 files changed
+3
-5
No files matched your search
@@ -6,14 +6,14 @@ VOLUME_MOUNTS=-v "$(CURDIR)":/v
|
||||
SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117)
|
||||
SHELLCHECK=docker run --rm $(VOLUME_MOUNTS) -w /v koalaman/shellcheck $(SHELLCHECK_EXCLUSIONS)
|
||||
|
||||
ENVSUBST_VARS=SCRIPT_COMMIT_SHA
|
||||
ENVSUBST_VARS=LOAD_SCRIPT_COMMIT_SHA
|
||||
|
||||
.PHONY: build
|
||||
build: build/install.sh
|
||||
|
||||
build/install.sh: install.sh
|
||||
mkdir -p $(@D)
|
||||
SCRIPT_COMMIT_SHA='$(shell git rev-parse HEAD)' envsubst '$(addprefix $$,$(ENVSUBST_VARS))' < $< > $@
|
||||
LOAD_SCRIPT_COMMIT_SHA='$(shell git rev-parse HEAD)' envsubst '$(addprefix $$,$(ENVSUBST_VARS))' < $< > $@
|
||||
|
||||
.PHONY: shellcheck
|
||||
shellcheck: build/install.sh
|
||||
|
||||
+1
-3
@@ -16,9 +16,7 @@ set -e
|
||||
#
|
||||
# Git commit from https://github.com/docker/docker-install when
|
||||
# the script was uploaded (Should only be modified by upload job):
|
||||
|
||||
# shellcheck disable=SC2140
|
||||
SCRIPT_COMMIT_SHA="${SCRIPT_COMMIT_SHA}"
|
||||
SCRIPT_COMMIT_SHA="${LOAD_SCRIPT_COMMIT_SHA}"
|
||||
|
||||
|
||||
# The channel to install from:
|
||||
|
||||
Reference in new issue
Block a user