From 8e8cbf8009eca35a9b845a9aec7d2b8e9a24c410 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 30 Dec 2016 22:05:27 +0100 Subject: [PATCH 1/5] Add .travis.yml Install GNU make and try to build the image. Add dedicated test command. --- .travis.yml | 9 +++++++++ Makefile | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..49398ab --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +sudo: required + +services: + - docker + +script: + - apt-get update + - apt-get install -y make + - make test-build diff --git a/Makefile b/Makefile index a866725..b616c8c 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,6 @@ default: build build: docker build -t $(IMAGE_FQN) . + +test-build: + docker build -t testbuild . From 3f73055f1fccaf93fdae2e2302949a24818b41e2 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 30 Dec 2016 22:44:11 +0100 Subject: [PATCH 2/5] Use provided make List APT packages under the addons.apt.packages key. See: https://docs.travis-ci.com/user/installing-dependencies#Adding-APT-Packages --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49398ab..d03dc36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,10 @@ sudo: required services: - docker +addons: + apt: + packages: + - make + script: - - apt-get update - - apt-get install -y make - make test-build From 59081392a7a8c07337cf0837a129db8abadc8285 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 30 Dec 2016 22:46:03 +0100 Subject: [PATCH 3/5] Add .travis.yml to .dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 8c97a8f..057ebf3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ .editorconfig +.travis.yml CHANGELOG.md LICENSE Makefile From ab628b1898f6d1e2302c19b6e924614f4b1797ce Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Fri, 30 Dec 2016 23:04:54 +0100 Subject: [PATCH 4/5] Try build without sudo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d03dc36..8d8abf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: required +sudo: false services: - docker From e49ff5c2c933cf19bc09a3d0de5fc032bb020920 Mon Sep 17 00:00:00 2001 From: Rudolf Tucek Date: Sat, 31 Dec 2016 08:37:04 +0100 Subject: [PATCH 5/5] Add Travis CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3d5893..3a068f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own version badge on microbadger.com") +[![Build Status](https://travis-ci.org/rtucek/docker-nginx-php.svg?branch=ci%2Ftravis)](https://travis-ci.org/rtucek/docker-nginx-php) [![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php.svg)](https://microbadger.com/images/janus1990/docker-nginx-php "Get your own version badge on microbadger.com") ## nginx-php Dockerfile