makefile: separate hadolint tag into its own var
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
85d8cf5359
commit
b6d194191d
5
Makefile
5
Makefile
@ -11,13 +11,14 @@ kanikocontext = .
|
|||||||
kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --build-arg BUILD_DATE=$(build_date) --build-arg VCS_REF=$(vcs_ref) --no-push
|
kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --build-arg BUILD_DATE=$(build_date) --build-arg VCS_REF=$(vcs_ref) --no-push
|
||||||
vcs_ref = $$(git rev-parse --short HEAD)
|
vcs_ref = $$(git rev-parse --short HEAD)
|
||||||
build_date= $$(date -u +"%Y-%m-%dT%H:%M:%SZ")
|
build_date= $$(date -u +"%Y-%m-%dT%H:%M:%SZ")
|
||||||
hadolintimg = hadolint/hadolint:v2.9.3-alpine
|
hadolintimg = hadolint/hadolint
|
||||||
|
hadolinttag = v2.9.3-alpine
|
||||||
hadolintargs = run --rm -i -v $$PWD/.hadolint.yaml:/root/.config/hadolint.yaml
|
hadolintargs = run --rm -i -v $$PWD/.hadolint.yaml:/root/.config/hadolint.yaml
|
||||||
|
|
||||||
.PHONY: hadolint build kaniko clean test prune
|
.PHONY: hadolint build kaniko clean test prune
|
||||||
|
|
||||||
hadolint:
|
hadolint:
|
||||||
$(dcmd) $(hadolintargs) $(hadolintimg) < $(dfile)
|
$(dcmd) $(hadolintargs) $(hadolintimg):$(hadolinttag) < $(dfile)
|
||||||
|
|
||||||
kaniko:
|
kaniko:
|
||||||
$(dcmd) $(dargskaniko) $(kanikoexecutorimg) $(kanikoargs)
|
$(dcmd) $(dargskaniko) $(kanikoexecutorimg) $(kanikoargs)
|
||||||
|
Loading…
Reference in New Issue
Block a user