wanderer/docker-fedora-cpp
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases 2 Activity

makefile: separate hadolint tag into its own var
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
surtur 2022-03-24 18:00:08 +01:00
parent 3bb4950e8e
commit d1518f11b7
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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)