From e09550febb44423e40d2752fbde42d260daa691e Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Wed, 14 Oct 2015 10:29:22 -0600 Subject: [PATCH] Add Makefile Make it easier to run tests. --- .dockerignore | 3 ++- Makefile | 6 ++++++ README.md | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/.dockerignore b/.dockerignore index 793cc94..8fafbb0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ .git .dockerignore +circle.yml +Makefile README.md test -circle.yml diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3eda887 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +.SILENT : +.PHONY : test + +test: + docker build -t jwilder/nginx-proxy:bats . + bats test diff --git a/README.md b/README.md index 80c4c6b..e619e35 100644 --- a/README.md +++ b/README.md @@ -218,3 +218,13 @@ If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=e If you want most of your virtual hosts to use a default single `location` block configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default_location` file. This file will be used on any virtual host which does not have a `/etc/nginx/vhost.d/{VIRTUAL_HOST}` file associated with it. +### Contributing + +Before submitting pull requests or issues, please check github to make sure an existing issue or pull request is not already open. + +#### Running Tests Locally + +To run tests, you'll need to install [bats 0.4.0](https://github.com/sstephenson/bats). + + make test +