瀏覽代碼

Merge pull request #265 from thomasleveil/makefile

makefile: add target to update docker images tests depend on
Jason Wilder 9 年之前
父節點
當前提交
defed25585
共有 2 個文件被更改,包括 9 次插入6 次删除
  1. 8 0
      Makefile
  2. 1 6
      circle.yml

+ 8 - 0
Makefile

@@ -1,6 +1,14 @@
 .SILENT :
 .SILENT :
 .PHONY : test
 .PHONY : test
 
 
+update-dependencies:
+	docker pull jwilder/docker-gen:latest
+	docker pull nginx:latest
+	docker pull python:3
+	docker pull rancher/socat-docker:latest
+	docker pull appropriate/curl:latest
+	docker pull docker:1.7
+
 test:
 test:
 	docker build -t jwilder/nginx-proxy:bats .
 	docker build -t jwilder/nginx-proxy:bats .
 	bats test
 	bats test

+ 1 - 6
circle.yml

@@ -10,12 +10,7 @@ dependencies:
     - sudo add-apt-repository ppa:duggan/bats --yes
     - sudo add-apt-repository ppa:duggan/bats --yes
     - sudo apt-get update -qq
     - sudo apt-get update -qq
     - sudo apt-get install -qq bats
     - sudo apt-get install -qq bats
-    - docker pull jwilder/docker-gen
-    - docker pull nginx
-    - docker pull python:3
-    - docker pull rancher/socat-docker
-    - docker pull appropriate/curl
-    - docker pull docker:1.7
+    - make update-dependencies
 
 
 test:
 test:
   override:
   override: