Fix merge conflict

Author: rtucek

CHANGELOG.md

@@ -1,10 +1,19 @@
+##### Tag v0.3.2 (2017-01-19)
+[![](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")
+
+- Add quay.io badges
+- Upgrade PHP to v7.1.1
+- Add 2nd GPG key from the PHP v7.1.x release managers (Joe Watkins <krakjoe@php.net>)
+
 ##### Tag v0.3.1 (2017-01-06)
+[![](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")
 
 - Rename image
 - Update badges
 
 ##### Tag v0.3.0 (2016-12-31)
 [![](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")
+
 - Add Travis CI - #1
 - Add Xdebug - #2
 

Dockerfile

@@ -2,7 +2,7 @@ FROM debian:jessie
 
 ENV \
     NGINX_VERSION=1.11.9 \
-    PHP_VERSION=7.1.0 \
+    PHP_VERSION=7.1.1 \
     XDEBUG_VERSION=2.5.0
 
 COPY \
@@ -115,6 +115,7 @@ RUN \
     # GPG keys from the release managers of PHP 7.1
     # Source https://secure.php.net/downloads.php#gpg-7.1
     gpg --keyserver pgp.mit.edu/ --recv "A917 B1EC DA84 AEC2 B568 FED6 F50A BC80 7BD5 DCD0" && \
+    gpg --keyserver pgp.mit.edu/ --recv "5289 95BF EDFB A719 1D46 839E F9BA 0ADA 31CB D89E" && \
 
     # Verify signature
     curl -SLo php-${PHP_VERSION}.tar.gz.asc http://ch1.php.net/get/php-${PHP_VERSION}.tar.gz.asc/from/this/mirror && \

Makefile

@@ -1,6 +1,6 @@
 REPO = rtucek
 IMAGE = nginx-php
-VERSION = 0.3.1
+VERSION = 0.3.2
 EXTRAVERSION =
 
 IMAGE_FQN = $(REPO)/$(IMAGE):v$(VERSION)$(EXTRAVERSION)

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/rtucek/nginx-php.svg?branch=master)](https://travis-ci.org/rtucek/nginx-php) [![](https://images.microbadger.com/badges/image/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own version badge on microbadger.com")
+[![Build Status](https://travis-ci.org/rtucek/nginx-php.svg?branch=master)](https://travis-ci.org/rtucek/nginx-php) [![Docker Repository on Quay](https://quay.io/repository/rtucek/nginx-php/status "Docker Repository on Quay")](https://quay.io/repository/rtucek/nginx-php) [![](https://images.microbadger.com/badges/image/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php.svg)](https://microbadger.com/images/rtucek/nginx-php "Get your own version badge on microbadger.com")
 
 ## nginx-php Dockerfile