From 9ce470e14ebb4cef1ece05043ec8fd876fc46e33 Mon Sep 17 00:00:00 2001
From: Patrick Mac Gregor <pmacgregor@3pc.de>
Date: Wed, 16 Aug 2017 11:21:04 +0200
Subject: [PATCH] [php-worker] dedicated dockerfile for php 7.0/7.1

fixes #927: PHP-Worker container uses PHP-CLI 7.0.9 despite workspace using 7.1.4
---
 docker-compose.yml                       |  1 +
 php-worker/{Dockerfile => Dockerfile-70} | 27 +++++++++--
 php-worker/Dockerfile-71                 | 59 ++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 4 deletions(-)
 rename php-worker/{Dockerfile => Dockerfile-70} (67%)
 create mode 100644 php-worker/Dockerfile-71

diff --git a/docker-compose.yml b/docker-compose.yml
index e5b875e9..d1b42272 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,6 +100,7 @@ services:
     php-worker:
       build:
         context: ./php-worker
+        dockerfile: "Dockerfile-${PHP_VERSION}"
       volumes_from:
         - applications
       depends_on:
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile-70
similarity index 67%
rename from php-worker/Dockerfile
rename to php-worker/Dockerfile-70
index 687cec5f..8b7dd601 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile-70
@@ -3,14 +3,30 @@
 # Image Setup
 #--------------------------------------------------------------------------
 #
-# To take a look at the'php-worker' base Image, visit its DockerHub page
-#    https://hub.docker.com/r/nielsvdoorn/laravel-supervisor/
-#
 
-FROM nielsvdoorn/laravel-supervisor
+FROM php:7.0-alpine
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+RUN apk --update add wget \
+  curl \
+  git \
+  build-base \
+  libmemcached-dev \
+  libmcrypt-dev \
+  libxml2-dev \
+  zlib-dev \
+  autoconf \
+  cyrus-sasl-dev \
+  libgsasl-dev \
+  supervisor
+
+RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
+RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached
+
+RUN rm /var/cache/apk/* \
+    && mkdir -p /var/www
+
 #
 #--------------------------------------------------------------------------
 # Optional Supervisord Configuration
@@ -19,8 +35,11 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Modify the ./supervisor.conf file to match your App's requirements.
 # Make sure you rebuild your container with every change.
 #
+
 COPY supervisord.conf /etc/supervisord.conf
 
+ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c",  "/etc/supervisord.conf"]
+
 #
 #--------------------------------------------------------------------------
 # Optional Software's Installation
diff --git a/php-worker/Dockerfile-71 b/php-worker/Dockerfile-71
new file mode 100644
index 00000000..697efb67
--- /dev/null
+++ b/php-worker/Dockerfile-71
@@ -0,0 +1,59 @@
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM php:7.1-alpine
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+RUN apk --update add wget \
+  curl \
+  git \
+  build-base \
+  libmemcached-dev \
+  libmcrypt-dev \
+  libxml2-dev \
+  zlib-dev \
+  autoconf \
+  cyrus-sasl-dev \
+  libgsasl-dev \
+  supervisor
+
+RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
+RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached
+
+RUN rm /var/cache/apk/* \
+    && mkdir -p /var/www
+
+#
+#--------------------------------------------------------------------------
+# Optional Supervisord Configuration
+#--------------------------------------------------------------------------
+#
+# Modify the ./supervisor.conf file to match your App's requirements.
+# Make sure you rebuild your container with every change.
+#
+
+COPY supervisord.conf /etc/supervisord.conf
+
+ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c",  "/etc/supervisord.conf"]
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# If you need to modify this image, feel free to do it right here.
+#
+    # -- Your awesome modifications go here -- #
+
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
+WORKDIR /etc/supervisor/conf.d/