1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-07-01 14:25:46 +00:00
Commit Graph

52 Commits

Author SHA1 Message Date
15cbb5debf Upgrade to nginx 1.11.9 2017-02-05 21:40:29 +01:00
004cc3cb8c Upgrade to nginx 1.11.8 2016-12-28 23:38:47 +01:00
b66398d1bf Updated nginx to 1.11.6 2016-12-08 13:24:49 -06:00
03e863d838 upgrade nginx to 1.11.3 2016-08-25 20:16:37 +02:00
86c408bbdd upgrade nginx to 1.11.0 2016-07-29 21:17:14 +02:00
8ed5ab38b8 Update to docker-gen 0.7.3 2016-06-13 00:24:21 -06:00
c256f31728 Update nginx 1.9.15 2016-06-10 20:08:10 -06:00
d40d1d4052 Update to docker-gen 0.7.1 2016-05-04 14:51:30 -06:00
a54af7d73b Switch forego downloads
Official ddollar site has been down for a while and not sure if it's
coming back up or not.
2016-04-04 16:48:52 -06:00
86aea653c8 Update to docker-gen 0.7.0
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).

This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.

Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.

The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.

[1]: 50435652b1
2016-03-23 17:45:34 +01:00
1f8b480365 moved nginx to 1.9.12 2016-03-21 22:47:01 +01:00
627f789f19 updated nginx to 1.9.9 2016-01-20 23:26:21 +01:00
588cdf6266 Update email address 2015-10-29 13:32:09 -06:00
5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00
3e530a0784 Use latest docker-gen 2015-10-13 21:49:19 +02:00
d45c10ca66 Use nginx 1.9.5 2015-09-23 17:43:31 +02:00
83b0b25c26 Merge pull request #228 from berfarah/patch-1
Bumping to latest Docker Gen version
2015-09-12 15:00:00 -06:00
f95ff82ad0 Adjust entrypoint to always warn on missing socket
Also chmod the entrypoint
2015-09-12 07:23:36 -07:00
1aac996019 conform to Docker official images best practices
https://github.com/docker-library/official-images/blob/master/README.md#consistency
2015-09-12 10:37:21 +00:00
d83ba3da1e refuse to start if the docker sock isn't available 2015-09-11 23:42:44 +00:00
d844c124ff Bumping to latest Docker Gen version
As per [this](https://github.com/jwilder/docker-gen/issues/114) ticket. Thanks again!
2015-09-01 09:38:43 -07:00
f36ca3d7a3 Prevent generating broken config
Fixes #115
2015-06-23 17:05:12 -07:00
89fe2a3898 Update to nginx 1.9.2 2015-06-20 22:25:52 +02:00
503072c03f Merge pull request #72 from BenHall/default_host
Ability to set a default host for nginx
2015-05-14 10:00:04 -06:00
7eb785cec5 Update base image to nginx:1.9.0 2015-05-01 14:01:30 -07:00
ead1912590 Update to Nginx 1.7.11 2015-03-27 10:11:54 -07:00
95df1d225e Update to docker-gen 0.3.9 2015-03-13 17:25:53 -06:00
1f426a6e61 Updated docker-gen version to 0.3.8 2015-03-13 14:53:40 -07:00
8d885aac1a Update to nginx:1.7.10 2015-03-10 21:15:42 -07:00
d7e499e4e6 Allow for even longer virtual host names (should work to at least 50 chars). 2015-01-02 10:49:21 +06:30
30a53fb60a Ability to set a default host for nginx 2014-12-24 12:21:40 +00:00
654e037741 Merge pull request #65 from josephpage/patch-1
Bump to nginx 1.7.8
2014-12-13 16:59:29 -07:00
10bc94f6db fixes problem to set server name max length…
current base image does not have commented configurations which means is impossible to use the previous configuration to set the server name max length
2014-12-13 10:00:45 -02:00
a668579392 Bump to nginx 1.7.8 2014-12-10 11:37:44 +01:00
db924dba76 Use nginx:1.7.7 2014-12-03 11:12:01 -07:00
3c5843264e Switch to official nginx base-image.
This changes the base-image to the official nginx image,
reducing the virtual size of the image by approx 50%.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2014-12-03 10:20:58 +01:00
2e43a5459b Add SSL support
This adds SSL support for containers.  It supports single host
certificates, wildcards and SNI using naming conventions for
certificates or optionally specify a cert name (for SNI).  The SSL
cipher configuration is based on mozilla intermediate profile which
should provide compatibility with clients back to Firefox 1, Chrome 1,
IE 7, Opera 5, Safari 1, Windows XP IE8, Android 2.3, Java 7.  The
configuration also enables OCSP stapling, HSTS, and ssl session caches.

To enable SSL, nginx-proxy should be started w/ -p 443:443 and -v
/path/to/certs:/etc/nginx/certs.  Certificates must be named:
<virtualhost>.crt and <virtualhost>.key where <virtualhost> matches
the a value of VIRTUAL_HOST on a container.

For wildcard certificates, the certificate and private key should be
named after the wildcard domain with .crt and .key suffixes.  For example,
*.example.com should be name example.com.crt and example.com.key.

For SNI where a certificate may be used for multiple domain names, the
container can specify a CERT_NAME env var that corresponds to the base
file name of the certificate and key.  For example, if you have a cert
allowing *.example.com and *.bar.com, it can be name shared.crt and
shared.key.  A container can use that cert by having CERT_NAME=shared and
VIRTUAL_HOST=foo.example.com.  The name "shared" is arbitrary and can
be whatever makes sense.

The behavior for the proxy when port 80 and 443 is defined is as
follows:

* If a container has a usable cert, port 80 will redirect to
443 for that container to always prefer HTTPS when available.
* If the container does not have a usable cert 503 will be returned.

In the last case, a self-signed or generic cert can be defined as
"default.crt" and "default.key" which will allow a client browser to
at least make a SSL connection.
2014-11-27 12:49:38 -07:00
7c4d0d22ac upgrade to docker-gen 0.3.6 2014-11-26 15:48:17 -07:00
d68be71a3f Optimize Dockerfile.
This optimizes the Dockerfile by;

- Combining RUN statements so that files are removed in the
  same layer as they are added.
- Removing the downloaded .tar.gz of the docker-gen binary
  after expanding
- Adding `--no-install-recommends` (but explicitly installing
  ca-certificates)
- Replacing `ADD` with `COPY` (recommended if no unpacking is
  required)

Also added a `.dockerignore` file to prevent the `.git` directory
and README.md being added to the image.

These changes reduce the size of the image with 34 MB (was 268.4 MB,
now 233.9 MB), and results in less layers being produced.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2014-11-26 11:00:01 +01:00
ddfd8ef8f4 Update to docker-gen 0.3.4 2014-10-22 16:32:50 -07:00
1404ecacf9 Upgrade Bash
Updated Dockerfile in order to update/upgrade bash to fix the security bug found by Red Hat https://securityblog.redhat.com/2014/09/24/bash-specially-crafted-environment-variables-code-injection-attack/
2014-09-25 12:59:36 +02:00
d8f579b1e2 Update Dockerfile 2014-09-25 12:53:13 +02:00
158508413a Upgrade to docker-gen 0.3.3 2014-09-19 14:57:36 -06:00
61bb0a62fb Only add source after dependency download
This lets docker cache the ADD instruction, giving us a faster build.
Also, install docker-gen directly to /usr/local/bin.
2014-09-17 20:23:27 +01:00
711a7b3852 Upgrade to docker-gen 0.3.2
* Adds exists template tag
* Fixes generating files to volumes
* Fixes inconsistency w/ -watch/-endpoint
2014-07-11 12:24:24 -06:00
6f7ac47a42 Use Ubuntu Trusty 14.04 as base image 2014-07-11 09:59:45 -06:00
b9d7bde5cd Support multiple VIRTUAL_HOSTs per container.
Fixes #3
2014-06-08 10:14:51 -06:00
ebce30e761 Use ddollar/forego v0.9.0 2014-06-08 10:10:59 -06:00
d3f4efaa83 Fix for long server names 2014-06-08 01:23:16 +05:30
4f3d690cd3 Stream logs to stdout/err
Nginx and docker-gen logs can now be seen via docker logs.
2014-06-03 16:30:05 -06:00