From 705d90d716e89297439db4ee879ca9bc8fdb0a06 Mon Sep 17 00:00:00 2001
From: Harvey <rjh@amazon.com>
Date: Sat, 2 Dec 2017 11:03:16 -0800
Subject: [PATCH] pre-release of 7.2 container

---
 Dockerfile         | 12 ++++++------
 README.md          |  1 +
 docs/versioning.md |  8 ++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dbc18db..c13da24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1.12-fpm-alpine
+FROM php:7.2.0-fpm-alpine
 
 LABEL maintainer="Ric Harvey <ric@ngd.io>"
 
@@ -10,7 +10,7 @@ ENV NGINX_VERSION 1.13.7
 ENV LUA_MODULE_VERSION 0.10.11
 ENV DEVEL_KIT_MODULE_VERSION 0.3.0
 ENV LUAJIT_LIB=/usr/lib
-ENV LUAJIT_INC=/usr/include/luajit-2.0
+ENV LUAJIT_INC=/usr/include/luajit-2.1
 
 # resolves #166
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
@@ -100,7 +100,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
   done; \
   test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
   gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
-  && rm -r "$GNUPGHOME" nginx.tar.gz.asc \
+  #&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
   && mkdir -p /usr/src \
   && tar -zxC /usr/src -f nginx.tar.gz \
   && tar -zxC /usr/src -f ndk.tar.gz \
@@ -158,7 +158,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
   && ln -sf /dev/stderr /var/log/nginx/error.log
 
 RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
-#    sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
     echo /etc/apk/respositories && \
     apk update && \
     apk add --no-cache bash \
@@ -195,8 +194,9 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
       --with-png-dir=/usr/include/ \
       --with-jpeg-dir=/usr/include/ && \
     #curl iconv session
-    docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
-    pecl install xdebug && \
+    #docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
+    docker-php-ext-install iconv pdo_mysql pdo_sqlite mysqli gd exif intl xsl json soap dom zip opcache && \
+    #pecl install xdebug && \
     docker-php-source delete && \
     mkdir -p /etc/nginx && \
     mkdir -p /var/www/app && \
diff --git a/README.md b/README.md
index 9659cad..8571731 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
 | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
 |-----|-------|-----|--------|--------|
 | latest | Master Branch |1.13.7 | 7.1.12 | 3.4 |
+| 1.4.0 | 7.2 Branch |1.13.7 | 7.2.0 | 3.6 |
 
 For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)
 
diff --git a/docs/versioning.md b/docs/versioning.md
index 18e5ae0..831d570 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -13,6 +13,8 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n
 
 The latest tag will always follow the master branch in git. the other versions will have releases attached.
 
+#### PHP 7.1
+
 | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
 |-----|-------|-----|--------|--------|--------|
 | latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 |
@@ -41,6 +43,12 @@ The latest tag will always follow the master branch in git. the other versions w
 | 1.3.9 | 1.3.9 |1.13.7 | 7.1.11 | 3.4 | 0.3.3 | 
 | 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 | 
 
+#### PHP 7.2
+
+| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
+|-----|-------|-----|--------|--------|--------|
+| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 |
+
 These tags will be created as releases on GitHub and as tags in docker hub.
 
 ### Unmaintained tags: