Skip to content

Commit 950472d

Browse files
committed
Merge branch 'master' into release/v0.4.1
* master: Bump PHP to v7.1.3 Bump Nginx version to v1.11.11 Upgrade to PHP v7.1.2 Upgrade to Nginx v1.11.10 Add commit SHA1 badge
2 parents 90afab0 + 05004f9 commit 950472d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##### Tag v0.4.0 (2017-02-14)
2-
[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own version badge on microbadger.com")
2+
[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own commit badge on microbadger.com")
33

44
- Add badges for v0.3.4 release
55
- Build image with more meta data

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ LABEL \
1313
org.label-schema.version=${VERSION}
1414

1515
ENV \
16-
NGINX_VERSION=1.11.9 \
17-
PHP_VERSION=7.1.1 \
16+
NGINX_VERSION=1.11.11 \
17+
PHP_VERSION=7.1.3 \
1818
XDEBUG_VERSION=2.5.0 \
1919
VERSION=${VERSION}
2020

0 commit comments

Comments
 (0)