dockerize 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ0ZTAxMzJlNWRlMDRiNzhjMTdlYzJlYTVmNzk0MTJiMDQ3YjY3Zg==
+    ZGZlODg5N2M4YzJiNTdkNjNiY2FhYmFlMDhkYjYwMjRlMDY3YmM4ZQ==
   data.tar.gz: !binary |-
-    M2Y2MGY0MWRjNjFhMTBhODIwODhiYjI4Nzc3ZmMxNWFkNWYzZDg2Ng==
+    ZTE2NmY5OTQwMGI3ZTAxNDY5ZDE1ZGMxY2FhMjM3ZmQ1MzU1NTZjYg==
 SHA512:
   metadata.gz: !binary |-
-    Y2IzNzQwZTk2ODE0NWQ1Y2NmNmJkMWVlMzAyNTAzNjkxM2Y1MWMzNGRlYTU2
-    NjM1OWNlZTE0ZDY1MDAzMDgwYTg0NTY5ZDY0YzhmZjU1MTI5OTAzNjNjMmQz
-    NzA4ZTBhMGRjZGYyNmE3MTFiZTcwNTkwYzg1N2Q1NzAwYmU3OWE=
+    YjE5MmMzNzdiMWZkZTI1MDdlZDgxODVjZmE2OTA5ZGU1NTBlYTNkY2NhOGM3
+    NTFjMjNjODRiNGRjOTcwZTRjMDZjODIwNTg4NThhNjJkYzlmZWFiMjdmYjRk
+    MDg1ZWE1MzA3NGFmNDliNzVjZDFlMzg4YWRjMjczNGQ3MjRhOGI=
   data.tar.gz: !binary |-
-    OTI4NTVhMDAyNTFjYWE5YWY3OGQzOWE3YTZlOGU3Mjk5MDI1YmU1NDQyMzVj
-    NGM0YjhkYzgwMmM5Yzg2ZGNmOWMwYzc1MzAwNzZmZGI2OTg1N2I3YzJlZGVh
-    MTZmMmUxNzE4ZjQ2MWE3ZTllZjE2ODYwZGVkYzlmMTI3OTEzMjQ=
+    OGZhY2Q1MjY1Y2I2MWE2ZmYyNjQzNzQ4Yjk0YjA5YmE5NzgxMjM0NTg5MjRj
+    NTU3MGI1MTdlNzYxMmI1ZmYzZWUzYzc0YzRmZTlhY2Y5MzQ4MDBmNmVlMzNj
+    OGFkYTJlNDRiMjZkYTAyZjlkYWVmY2U4MWM0NGRlZDJkZTk3YWE=

data/lib/dockerize/version.rb

@@ -2,6 +2,6 @@
 
 unless defined?(Dockerize::VERSION)
   module Dockerize
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/templates/makefile_docker.erb

@@ -5,7 +5,7 @@ REV ?= $(shell git describe --always)
 BUILD_FLAGS ?= -no-cache=true -rm=true
 PROJECT ?= $(shell basename $(PWD))
 REGISTRY ?= <%= registry %>
-LATEST ?= $(shell $(DOCKER) images | grep -v REPOSITORY | head -n 1 | grep -E '<none>|$(REGISTRY)\/$(PROJECT)' | awk '{print $$3}')
+LATEST ?= $(shell $(DOCKER) images | grep -v REPOSITORY | head -n 1 | grep -E '$(REGISTRY)\/$(PROJECT)' | awk '{print $$3}')
 
 export DOCKER
 export REV
@@ -14,51 +14,32 @@ export PROJECT
 export REGISTRY
 export LATEST
 
-# This is a general Makefile, designed to be present at the top level of your
-# project for general docker development.  Be sure to use `docker login` on the
-# vagrant vm before trying to push or pull any containers.
-
 all:
-	@echo "Available targets:"
-	@echo "  * clean     - remove all local images (and tags) for $(PROJECT)"
-	@echo "  * container - build a Docker container for $(PROJECT)"
-	@echo "  * latest    - builds and tags the latest container for $(PROJECT) as 'latest'"
-	@echo "  * pull      - pull down previous docker builds of $(REGISTRY)/$(PROJECT)"
-	@echo "  * push      - push $(REGISTRY)/$(PROJECT)"
-	@echo "  * tag       - tags the lastest image as 'latest'"
-
-container: .latest_container Dockerfile
-
-latest: build_and_tag
+  @echo "Available targets:"
+  @echo "  * clean     - remove all local images (and tags) for $(PROJECT)"
+  @echo "  * build     - build and tag the latest a Docker container for $(PROJECT)"
+  @echo "  * pull      - pull down previous docker builds of $(REGISTRY)/$(PROJECT)"
+  @echo "  * push      - push $(REGISTRY)/$(PROJECT)"
+  @echo "  * tag       - tags the lastest image as 'latest' (run as part of build as well)"
 
-tag: delete_current_tag .latest_tagged
+build: container tag
 
-push: .latest_pushed
+container:
+  $(DOCKER) build -t $(REGISTRY)/$(PROJECT):$(REV) $(BUILD_FLAGS) .
 
-delete_current_tag:
-	rm -f .latest_tagged
+tag:
+  ( test -z "$(LATEST)" && echo 'Nothing to tag!' ) || $(DOCKER) tag $(LATEST) $(REGISTRY)/$(PROJECT):latest
 
 clean:
-	rm -f .latest_container .latest_tagged .latest_pushed .container_output
-	export IMAGES="$(shell $(DOCKER) images | grep -E '<none>|$(REGISTRY)/$(PROJECTS)')" ; \
-	  test -z "$$IMAGES" || echo "$$IMAGES" | awk '{ print $$3 }' | \
-	  sort | uniq | xargs $(DOCKER) rmi
-
-.latest_container: pull
-	rm -f $@
-	$(DOCKER) rm $(shell docker ps -a -q)
-	$(DOCKER) build -t $(REGISTRY)/$(PROJECT):$(REV) $(BUILD_FLAGS) . | tee .container_output
-	awk '/^Successfully built/ { print $$NF }' .container_output | tail -1 > $@
-
-.latest_tagged:
-	( test -z "$(LATEST)" && echo 'Nothing to tag!' ) || $(DOCKER) tag $(LATEST) $(REGISTRY)/$(PROJECT):latest && touch $@
-
-build_and_tag: .latest_container tag
+  $(DOCKER) rm $(shell docker ps -a -q)
+  export IMAGES="$(shell $(DOCKER) images | grep -E '<none>')" ; \
+    test -z "$$IMAGES" || echo "$$IMAGES" | awk '{ print $$3 }' | \
+    sort | uniq | xargs $(DOCKER) rmi
 
 pull:
-	$(DOCKER) pull $(REGISTRY)/$(PROJECT) || true
+  $(DOCKER) pull $(REGISTRY)/$(PROJECT) || true
 
-.latest_pushed: .latest_tagged
-	$(DOCKER) push $(REGISTRY)/$(PROJECT)
+push:
+  $(DOCKER) push $(REGISTRY)/$(PROJECT) || true
 
-.PHONY: container latest push clean build_and_tag tag delete_current_tag pull
+.PHONY: build container tag clean pull push all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerize
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rafe Colton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake