~cjwatson/isitdeployable/breezy

« back to all changes in this revision

Viewing changes to Makefile.k8s

run tests using docker/docker-compose

run tests using "production" image as base

Merged from https://code.launchpad.net/~ricardokirkner/isitdeployable/tests-using-docker/+merge/330610

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
k8s-build: fetch-sourcedeps  ## Build container image
33
33
        @echo 'Building image on:' $(shell lsb_release -cs)
34
34
        @echo 'Building image using docker version:' $(shell docker version -f "Server: {{.Server.Version}} Client: {{.Client.Version}}")
35
 
        $(eval BUILD_ARGS = --build-arg BUILD_REVISION="r$(shell bzr revno)")
 
35
        $(eval BUILD_ARGS = --label revision="$(shell bzr revno)")
36
36
ifneq ($(HTTP_PROXY),)
37
37
        $(eval BUILD_ARGS = $(BUILD_ARGS) --build-arg http_proxy=$(HTTP_PROXY)) 
38
38
endif