Updated Makefile with changes to container rules
This commit is contained in:
parent
73ca17dce6
commit
7a1b57931e
1 changed files with 3 additions and 2 deletions
5
Makefile
5
Makefile
|
|
@ -2,6 +2,7 @@
|
||||||
DOCKER ?= docker
|
DOCKER ?= docker
|
||||||
|
|
||||||
prog ?= configurator
|
prog ?= configurator
|
||||||
|
git_tag := $(git describe --abbrev=0 --tags)
|
||||||
sources := main.go $(wildcard cmd/*.go)
|
sources := main.go $(wildcard cmd/*.go)
|
||||||
plugin_source_prefix := pkg/generator/plugins
|
plugin_source_prefix := pkg/generator/plugins
|
||||||
plugin_sources := $(filter-out %_test.go,$(wildcard $(plugin_source_prefix)/*/*.go))
|
plugin_sources := $(filter-out %_test.go,$(wildcard $(plugin_source_prefix)/*/*.go))
|
||||||
|
|
@ -24,11 +25,11 @@ $(prog): $(sources)
|
||||||
|
|
||||||
.PHONY: container
|
.PHONY: container
|
||||||
container: binaries plugins
|
container: binaries plugins
|
||||||
$(DOCKER) build . --build-arg --no-cache --pull --tag 'configurator:testing'
|
$(DOCKER) build . --build-arg --no-cache --pull --tag '$(prog):$(git_tag)-dirty'
|
||||||
|
|
||||||
.PHONY: container-testing
|
.PHONY: container-testing
|
||||||
container-testing: binaries plugins
|
container-testing: binaries plugins
|
||||||
$(DOCKER) build . --tag configurator:testing
|
$(DOCKER) build . --tag $(prog):testing
|
||||||
|
|
||||||
# build all of the generators into plugins
|
# build all of the generators into plugins
|
||||||
.PHONY: plugins
|
.PHONY: plugins
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue