isitdeployable

Merge lp:~ricardokirkner/isitdeployable/clean-docker-image into lp:isitdeployable

  1. clean-docker-image
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 291
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~ricardokirkner/isitdeployable/clean-docker-image
Merge into: lp:isitdeployable
Diff against target: 23 lines (+6/-0)
1 file modified
Makefile.k8s (+6/-0)
To merge this branch: bzr merge lp:~ricardokirkner/isitdeployable/clean-docker-image
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+343194@code.launchpad.net

Commit message

added make rule to clean docker image

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/isitdeployable-docker/53/

lp:~ricardokirkner/isitdeployable/clean-docker-image updated
291. By Ricardo Kirkner

fixed syntax in makefile

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.k8s'
--- Makefile.k8s 2017-11-10 16:18:36 +0000
+++ Makefile.k8s 2018-04-13 14:01:54 +0000
@@ -8,6 +8,7 @@
88
9# public targets9# public targets
1010
11.PHONY: k8s-build
11k8s-build: fetch-sourcedeps ## Build container image12k8s-build: fetch-sourcedeps ## Build container image
12 @echo 'Building image on:' $(shell lsb_release -cs)13 @echo 'Building image on:' $(shell lsb_release -cs)
13 @echo 'Building image using docker version:' $(shell docker version -f "Server: {{.Server.Version}} Client: {{.Client.Version}}")14 @echo 'Building image using docker version:' $(shell docker version -f "Server: {{.Server.Version}} Client: {{.Client.Version}}")
@@ -23,6 +24,11 @@
23endif24endif
24 docker build $(BUILD_ARGS) -t $(IMAGE_NAME):$(IMAGE_TAG) .25 docker build $(BUILD_ARGS) -t $(IMAGE_NAME):$(IMAGE_TAG) .
2526
27.PHONY: k8s-upload
26k8s-upload: ## Upload image to registry28k8s-upload: ## Upload image to registry
27 docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) 29 docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
28 docker push $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)30 docker push $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
31
32.PHONY: k8s-clean
33k8s-clean: ## Remove image
34 docker rmi $(shell docker image list -q $(IMAGE_NAME):$(IMAGE_TAG))

Subscribers

People subscribed via source and target branches