Skip to content

Commit d1f4b84

Browse files
authored
Merge pull request #2 from cytopia/release-0.9
Release 0.9
2 parents ad73074 + c331a5e commit d1f4b84

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ before_script:
5353

5454
# Disable services enabled by default
5555
# http://docs.travis-ci.com/user/database-setup/#MySQL
56-
- sudo /etc/init.d/mysql stop
57-
- sudo /etc/init.d/postgresql stop
56+
- sudo /etc/init.d/mysql stop || true
57+
- sudo /etc/init.d/postgresql stop || true
5858

5959

6060
###

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL \
1313
image="nginx-mainline" \
1414
vendor="cytopia" \
1515
license="MIT" \
16-
build-date="2017-04-18"
16+
build-date="2017-05-16"
1717

1818

1919
# Copy scripts

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nginx mainline Docker
22

3-
<small>**Latest build:** 2017-04-18</small>
3+
<small>**Latest build:** 2017-05-16</small>
44

55
[![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [![](https://images.microbadger.com/badges/version/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/image/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/license/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline")
66

@@ -148,7 +148,7 @@ It allows any of the following combinations:
148148
## Version
149149

150150
```
151-
nginx version: nginx/1.11.13
151+
nginx version: nginx/1.13.0
152152
built by gcc 4.8.5 20150623 (Red Hat 4.8.5-11) (GCC)
153153
built with OpenSSL 1.0.1e-fips 11 Feb 2013
154154
TLS SNI support enabled

scripts/docker-install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ run "cd /tmp/${VERSION} && \
135135
--with-http_ssl_module \
136136
--with-http_v2_module \
137137
\
138+
--with-http_stub_status_module \
139+
\
138140
--with-cc-opt='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic' --with-ld-opt='-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,-E' \
139141
--with-ld-opt='-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,-E' \
140142
&& \

0 commit comments

Comments
 (0)