move docker setup into Makefile

this moves the docker services setup into the Makefile making it easier
to run the full CI test suite with just a single `make ci` command.

Author: mrtazz

.github/CONTRIBUTING.md

@@ -9,7 +9,9 @@
 
 ## How to run tests
 
+Since most of the tests are actually integration tests you will need to have a
+working docker setup to make the full test suite pass.
+
 1. build vendorized gtest: `./utils/build_gtest.sh`
 2. build restclient-cpp: `./autogen.sh && ./configure && make check`
-3. run the proxy server used in testing: `docker run -d -p 3128:3128 chrisdaish/squid`
-4. run the unit test suite: `make test`
+3. run the unit test suite: `make ci`

.travis.yml

@@ -13,10 +13,6 @@ script:
   - ./autogen.sh && ./configure --enable-coverage
   - make ci
 
-before_install:
-  - docker pull chrisdaish/squid
-  - docker run -d -p 3128:3128 chrisdaish/squid
-  - docker ps -a
 install:
 - gem install fpm
 - gem install package_cloud

Makefile.am

@@ -16,7 +16,7 @@ librestclient_cpp_la_LDFLAGS=-version-info 2:1:1
 
 dist_doc_DATA = README.md
 
-.PHONY: test check clean-coverage-files coverage-html include/restclient-cpp/version.h lint ci
+.PHONY: test check clean-coverage-files coverage-html include/restclient-cpp/version.h lint ci docker-services
 
 include/restclient-cpp/version.h:
 	m4 -I m4 -DM4_RESTCLIENT_VERSION=$(VERSION) version.h.m4 > $@
@@ -30,7 +30,11 @@ valgrind: check
 lint:
 	cpplint --filter=-legal/copyright include/restclient-cpp/*.h source/*.cc
 
-ci: lint test valgrind
+docker-services:
+	docker inspect --format="{{ .State.Running }}" restclient-proxy &> /dev/null || docker run -d --name restclient-proxy -p 3128:3128 chrisdaish/squid
+	docker ps -a
+
+ci: lint docker-services test valgrind
 
 clean-local:
 	find . -name "*.gcda" -print0 | xargs -0 rm