From 5238f438d7b7c0c0dc9f44768630ccedea86d8d7 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Fri, 26 May 2017 19:02:48 +0200
Subject: [PATCH] update to alpine 3.6

---
 nginx-php/7.1/Dockerfile                                    | 5 +++--
 nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 19edd9d..081df64 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG BUILD_CORES
 
@@ -104,6 +104,7 @@ ARG CUSTOM_BUILD_PKGS=" \
     libedit-dev \
     libxml2-dev \
     libressl-dev \
+    libbz2 \
     sqlite-dev"
 
 ARG CUSTOM_PKGS=" \
@@ -111,7 +112,7 @@ ARG CUSTOM_PKGS=" \
     openldap \
     gmp \
     libmcrypt \
-    libbz2 \
+    bzip2-dev \
     icu \
     libpq"
 
diff --git a/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure b/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
index 34fc8f8..dc7a3a6 100644
--- a/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
+++ b/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
@@ -15,5 +15,6 @@ shift
 
 set -x
 cd "$extDir"
+[[ ! -f "config.m4" && -f "config0.m4" ]] && mv config0.m4 config.m4
 phpize
 ./configure "$@"