From 5df7fad4ba98faa09f4d99b62e0a0297011e81aa Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sat, 7 May 2016 00:46:59 +0200
Subject: [PATCH] rainloop: php5 -> php7

---
 rainloop/Dockerfile       | 25 +++++++++++++------------
 rainloop/run.sh           |  1 -
 rainloop/supervisord.conf |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile
index 5f61c39..069a5bd 100644
--- a/rainloop/Dockerfile
+++ b/rainloop/Dockerfile
@@ -4,19 +4,20 @@ MAINTAINER Wonderfall <wonderfall@mondedie.fr>
 ENV GID=1000 UID=1000
 
 RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+ && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk -U add \
     nginx \
-    php-fpm \
-    php-curl \
-    php-iconv \
-    php-xml \
-    php-dom \
-    php-openssl \
-    php-json \
-    php-zlib \
-    php-pdo_mysql \
-    php-pdo_sqlite \
-    php-sqlite3 \
+    php7-fpm@testing \
+    php7-curl@testing \
+    php7-iconv@testing \
+    php7-xml@testing \
+    php7-dom@testing \
+    php7-openssl@testing \
+    php7-json@testing \
+    php7-zlib@testing \
+    php7-pdo_mysql@testing \
+    php7-pdo_sqlite@testing \
+    php7-sqlite3@testing \
     supervisor \
     gnupg \
     tini@commuedge \
@@ -32,7 +33,7 @@ RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/ap
  && rm -rf /tmp/* /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php/php-fpm.conf
+COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY supervisord.conf /usr/local/etc/supervisord.conf
 COPY run.sh /usr/local/bin/run.sh
 
diff --git a/rainloop/run.sh b/rainloop/run.sh
index c8a94ce..fe8d54e 100644
--- a/rainloop/run.sh
+++ b/rainloop/run.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 addgroup -g ${GID} rainloop && adduser -h /rainloop -s /bin/sh -D -G rainloop -u ${UID} rainloop
-
 chown -R rainloop:rainloop /rainloop /var/run/php-fpm.sock /var/lib/nginx /tmp
 supervisord -c /usr/local/etc/supervisord.conf
diff --git a/rainloop/supervisord.conf b/rainloop/supervisord.conf
index 61657fa..f2cd4b1 100644
--- a/rainloop/supervisord.conf
+++ b/rainloop/supervisord.conf
@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:php-fpm]
-command=php-fpm
+command=php-fpm7
 
 [program:nginx]
 command=nginx