From a54af7d73bd1a716c180f8ed3bc74b94f29c0948 Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Mon, 4 Apr 2016 16:48:52 -0600 Subject: [PATCH 1/2] Switch forego downloads Official ddollar site has been down for a while and not sure if it's coming back up or not. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96602b0..5691ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ && sed -i 's/^http {/&\n server_names_hash_bucket_size 128;/g' /etc/nginx/nginx.conf # Install Forego -RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego \ - && chmod u+x /usr/local/bin/forego +ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego +RUN chmod u+x /usr/local/bin/forego ENV DOCKER_GEN_VERSION 0.7.0 From 30e2da01e9d413adadae5b7d6069fa4750823225 Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Mon, 4 Apr 2016 17:01:47 -0600 Subject: [PATCH 2/2] Add travis.yml From #312 --- .travis.yml | 22 ++++++++++++++++++++++ README.md | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b6b1364 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +sudo: required +services: + - docker + +env: + global: + - DOCKER_VERSION=1.10.1-0~trusty + +before_install: + # list docker-engine versions + - apt-cache madison docker-engine + # upgrade docker-engine to specific version + - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION} + - docker version + - docker info + - sudo add-apt-repository ppa:duggan/bats --yes + - sudo apt-get update -qq + - sudo apt-get install -qq bats + - make update-dependencies + +script: + - make test diff --git a/README.md b/README.md index 76e9987..d277421 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![nginx 1.9.12](https://img.shields.io/badge/nginx-1.9.12-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy) +![nginx 1.9.12](https://img.shields.io/badge/nginx-1.9.12-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy) [![Build Status](https://travis-ci.org/jwilder/nginx-proxy.svg?branch=master)](https://travis-ci.org/jwilder/nginx-proxy) nginx-proxy sets up a container running nginx and [docker-gen][1]. docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.