Skip to content

Commit 47f978d

Browse files
committed
Merge branch 'master' into release/v0.3.3
2 parents cc348cc + 4e17d6f commit 47f978d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
##### Tag v0.3.2 (2017-01-19)
2+
[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.3.2.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.2 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.3.2.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.2 "Get your own version badge on microbadger.com")
23

34
- Add quay.io badges
45
- Upgrade PHP to v7.1.1
56
- Add 2nd GPG key from the PHP v7.1.x release managers (Joe Watkins <krakjoe@php.net>)
67

78
##### Tag v0.3.1 (2017-01-06)
9+
[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.3.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.3.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.1 "Get your own version badge on microbadger.com")
810

911
- Rename image
1012
- Update badges
1113

1214
##### Tag v0.3.0 (2016-12-31)
1315
[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.3.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.3.0 "Get your own version badge on microbadger.com")
16+
1417
- Add Travis CI - #1
1518
- Add Xdebug - #2
1619

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:jessie
22

33
ENV \
4-
NGINX_VERSION=1.11.8 \
4+
NGINX_VERSION=1.11.9 \
55
PHP_VERSION=7.1.1 \
66
XDEBUG_VERSION=2.5.0
77

0 commit comments

Comments
 (0)