From d62f18ed3f2d2815e5dc5ce89523d4b2511bc91d Mon Sep 17 00:00:00 2001
From: vdo <vdo@greyfaze.net>
Date: Thu, 4 Apr 2019 14:46:46 +0200
Subject: [PATCH] Bump version to 15.0.6

---
 build/Dockerfile              |  9 +++++----
 build/config/redis.config.php | 12 ++++++++++++
 build/entrypoint.sh           |  1 +
 build/upgrade.exclude         |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 build/config/redis.config.php

diff --git a/build/Dockerfile b/build/Dockerfile
index 454842a..28a7bca 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         libcurl4-openssl-dev \
+        libevent-dev \
         libfreetype6-dev \
         libicu-dev \
         libjpeg-dev \
@@ -52,9 +53,9 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.15; \
-    pecl install memcached-3.0.4; \
-    pecl install redis-4.2.0; \
+    pecl install APCu-5.1.17; \
+    pecl install memcached-3.1.3; \
+    pecl install redis-4.3.0; \
     pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
@@ -109,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 15.0.0
+ENV NEXTCLOUD_VERSION 15.0.6
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/build/config/redis.config.php b/build/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/build/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+  $CONFIG = array (
+    'memcache.distributed' => '\OC\Memcache\Redis',
+    'memcache.locking' => '\OC\Memcache\Redis',
+    'redis' => array(
+      'host' => getenv('REDIS_HOST'),
+      'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+    ),
+  );
+}
+
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 07644c0..6ef2540 100755
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -51,6 +51,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
             fi
         done
+        rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
         echo "Initializing finished"
 
         #install
diff --git a/build/upgrade.exclude b/build/upgrade.exclude
index a1f2de9..354864d 100644
--- a/build/upgrade.exclude
+++ b/build/upgrade.exclude
@@ -2,3 +2,4 @@
 /data/
 /custom_apps/
 /themes/
+/version.php