Commit graph

9 commits

Author SHA1 Message Date
neil
e3be0de5ba Merge branch 'source' into upstream
# Conflicts:
#	nginx.tmpl
2017-06-13 10:00:53 +08:00
neil
5af1bac769 add ssl for alpine 2017-06-13 09:58:11 +08:00
neil
a3cd96ead4 alpine fix worker_processes to "auto" 2017-06-13 09:11:27 +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
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
Matthias Döring
c1d93d112a Upgrade nginx-alpine to 1.11.8 2016-12-29 00:18:06 +01:00
Matthias Döring
ba55d1a0b6 Add alpine base image
- Inspired by #408
- Possible solution for #543
2016-09-02 17:11:36 +02:00