cglewis
55610b8425
MAINTAINER is deprecated, using LABEL now
2017-10-31 18:21:12 -07:00
Steve Kamerman
93d90884e2
Implemented NETWORK_ACCESS (squash commit)
2017-10-18 13:29:12 -04:00
Matthias Döring
febf85d7e2
Move to 1.13 base image to get auto updates
...
Less maintenance and more security
Resolves #880
2017-07-21 13:45:33 +02:00
Steve Kamerman
761bbf9dbc
Removed duplicate server_names_hash_bucket_size directive
2017-06-18 21:21:05 -04:00
Jason Wilder
c41186a3a4
Merge branch 'master' into feature_ssl_improvement
2017-06-14 16:31:12 -06:00
neil
1867228cce
fix worker_processes to "auto"
2017-06-12 15:59:55 +08:00
Tobias Hüske
2c4102d396
Upgrade to 1.13.0
2017-05-04 18:57:00 +02:00
Matthias Döring
172d79aff4
Upgrade to nginx 1.11.13
2017-04-07 12:58:49 +02:00
Steve Kamerman
ad9af2884d
Merged master, fixed BATS conflict
2017-03-06 10:48:12 -05:00
Matthias Döring
7bafa37a52
Upgrade to nginx 1.11.10
2017-02-21 14:03:54 +01:00
Matthias Döring
15cbb5debf
Upgrade to nginx 1.11.9
2017-02-05 21:40:29 +01:00
Steve Kamerman
dfdd67f5a4
Implemented background dhparam generation
2017-01-11 22:43:09 -05:00
Steve Kamerman
f186815c2d
Merged upstream
2017-01-11 22:42:35 -05:00
Matthias Döring
004cc3cb8c
Upgrade to nginx 1.11.8
2016-12-28 23:38:47 +01:00
Cody Ramaker
b66398d1bf
Updated nginx to 1.11.6
2016-12-08 13:24:49 -06:00
Steve Kamerman
b0de80d46b
Moved config edits from Dockerfile to template
2016-10-03 10:21:31 -04:00
Steve Kamerman
8534185b0c
Added newline to config
2016-10-03 10:05:55 -04:00
Steve Kamerman
0b1e9e56e1
Issue #535 Added default 2048-bit dhparam.pem file
2016-09-29 16:48:18 -04:00
hwang
03e863d838
upgrade nginx to 1.11.3
2016-08-25 20:16:37 +02:00
hwang
86c408bbdd
upgrade nginx to 1.11.0
2016-07-29 21:17:14 +02:00
Jason Wilder
8ed5ab38b8
Update to docker-gen 0.7.3
2016-06-13 00:24:21 -06:00
Jason Wilder
c256f31728
Update nginx 1.9.15
2016-06-10 20:08:10 -06:00
Jason Wilder
d40d1d4052
Update to docker-gen 0.7.1
2016-05-04 14:51:30 -06:00
Jason Wilder
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
Pit Kleyersburg
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
Mike Rohland
1f8b480365
moved nginx to 1.9.12
2016-03-21 22:47:01 +01:00
Tobias Munk
627f789f19
updated nginx to 1.9.9
2016-01-20 23:26:21 +01:00
Jason Wilder
588cdf6266
Update email address
2015-10-29 13:32:09 -06:00
Mike Dillon
5404938797
Update to nginx 1.9.6
2015-10-28 21:29:39 -07:00
Marius Gundersen
3e530a0784
Use latest docker-gen
2015-10-13 21:49:19 +02:00
Aleš Roubíček
d45c10ca66
Use nginx 1.9.5
2015-09-23 17:43:31 +02:00
Jason Wilder
83b0b25c26
Merge pull request #228 from berfarah/patch-1
...
Bumping to latest Docker Gen version
2015-09-12 15:00:00 -06:00
Mike Dillon
f95ff82ad0
Adjust entrypoint to always warn on missing socket
...
Also chmod the entrypoint
2015-09-12 07:23:36 -07:00
Thomas LEVEIL
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
Thomas LEVEIL
d83ba3da1e
refuse to start if the docker sock isn't available
2015-09-11 23:42:44 +00:00
Bernardo Farah
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
Mike Dillon
f36ca3d7a3
Prevent generating broken config
...
Fixes #115
2015-06-23 17:05:12 -07:00
Joseph Page
89fe2a3898
Update to nginx 1.9.2
2015-06-20 22:25:52 +02:00
Jason Wilder
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
Mike Dillon
7eb785cec5
Update base image to nginx:1.9.0
2015-05-01 14:01:30 -07:00
Mike Dillon
ead1912590
Update to Nginx 1.7.11
2015-03-27 10:11:54 -07:00
Jason Wilder
95df1d225e
Update to docker-gen 0.3.9
2015-03-13 17:25:53 -06:00
Bernardo Farah
1f426a6e61
Updated docker-gen version to 0.3.8
2015-03-13 14:53:40 -07:00
Mike Dillon
8d885aac1a
Update to nginx:1.7.10
2015-03-10 21:15:42 -07:00
Julien Pervillé
d7e499e4e6
Allow for even longer virtual host names (should work to at least 50 chars).
2015-01-02 10:49:21 +06:30
Ben Hall
30a53fb60a
Ability to set a default host for nginx
2014-12-24 12:21:40 +00:00
Jason Wilder
654e037741
Merge pull request #65 from josephpage/patch-1
...
Bump to nginx 1.7.8
2014-12-13 16:59:29 -07:00
Max Claus Nunes
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
Joseph Page
a668579392
Bump to nginx 1.7.8
2014-12-10 11:37:44 +01:00
Jason Wilder
db924dba76
Use nginx:1.7.7
2014-12-03 11:12:01 -07:00
