From 4d2665ecd00f5b2bad25165c3ec3819371301349 Mon Sep 17 00:00:00 2001
From: Hardware <contact@meshup.net>
Date: Sun, 12 Mar 2017 20:40:40 +0100
Subject: [PATCH] chore(): update to php 7.1

---
 Dockerfile   | 35 ++++++++++++++++++-----------------
 run.sh       |  2 +-
 s6.d/php/run |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 187d734..cd38a2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:edge
 
 LABEL description "Next-generation forum software that makes online discussion fun" \
       maintainer="Hardware <hardware@mondedie.fr>, Magicalex <magicalex@mondedie.fr>"
@@ -7,26 +7,27 @@ ARG VERSION=v0.1.0-beta.6
 
 ENV GID=991 UID=991
 
-RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk -U add \
     nginx \
     s6 \
     su-exec \
     curl \
-    php7-phar@community \
-    php7-fpm@community \
-    php7-curl@community \
-    php7-mbstring@community \
-    php7-openssl@community \
-    php7-json@community \
-    php7-pdo_mysql@community \
-    php7-gd@community \
-    php7-dom@community \
-    php7-ctype@community \
-    php7-session@community \
-    php7-opcache@community \
+    php7.1@testing \
+    php7.1-fileinfo@testing \
+    php7.1-phar@testing \
+    php7.1-fpm@testing \
+    php7.1-curl@testing \
+    php7.1-mbstring@testing \
+    php7.1-openssl@testing \
+    php7.1-json@testing \
+    php7.1-pdo_mysql@testing \
+    php7.1-gd@testing \
+    php7.1-dom@testing \
+    php7.1-ctype@testing \
+    php7.1-session@testing \
+    php7.1-opcache@testing \
  && cd /tmp \
- && ln -s /usr/bin/php7 /usr/bin/php \
  && curl -s http://getcomposer.org/installer | php \
  && mv /tmp/composer.phar /usr/bin/composer \
  && chmod +x /usr/bin/composer \
@@ -42,8 +43,8 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/a
  && rm -rf /flarum/.composer /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
-COPY opcache.ini /etc/php7/conf.d/00_opcache.ini
+COPY php-fpm.conf /etc/php7.1/php-fpm.conf
+COPY opcache.ini /etc/php7.1/conf.d/00_opcache.ini
 COPY config.php /flarum/app/config.php
 COPY extension /usr/local/bin/extension
 COPY s6.d /etc/s6.d
diff --git a/run.sh b/run.sh
index 36c6400..6205740 100644
--- a/run.sh
+++ b/run.sh
@@ -24,7 +24,7 @@ if [ -z "$FORUM_URL" ]; then
 fi
 
 # Set permissions
-chown -R $UID:$GID /flarum /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /flarum /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
 
 cd /flarum/app
 
diff --git a/s6.d/php/run b/s6.d/php/run
index e238021..e0b458a 100644
--- a/s6.d/php/run
+++ b/s6.d/php/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7
+exec php-fpm7.1