From 66d401c07566070a6c855489656783fd2fde781b Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Wed, 14 Oct 2015 19:34:30 +0000 Subject: [PATCH] makefile: update docker images before running tests --- Makefile | 8 ++++++++ circle.yml | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3eda887..4eaf98a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,14 @@ .SILENT : .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: docker build -t jwilder/nginx-proxy:bats . bats test diff --git a/circle.yml b/circle.yml index e808c6e..424084c 100644 --- a/circle.yml +++ b/circle.yml @@ -10,12 +10,7 @@ dependencies: - sudo add-apt-repository ppa:duggan/bats --yes - sudo apt-get update -qq - 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: override: