-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'upstream/master' into 'origin/master'
* commit '205b3916776c97aca267dc7f4868d4ff7feb1240': Typo fix. Update email address Update to nginx 1.9.6 makefile: update docker images before running tests Use make test from circle.yml Add Makefile Update .dockerignore to recent file additions Use latest docker-gen trim whitespace from host and port Trap TERM to allow quicker exit of web containers Use docker:1.7 image to match CircleCI's version Remove --rm from docker run commands Remove commented out line Pull additional images needed for Circle CI Check "docker version" from a sibling container Avoid breakage from IFS being reset in "run" Run curl commands from a sibling container Avoid xargs -r Change line endings to Unix Conflicts: test/multiple-ports.bats
- Loading branch information
Showing
13 changed files
with
185 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
.git | ||
.dockerignore | ||
circle.yml | ||
Makefile | ||
README.md | ||
test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.