From be512ee2b3358da0f27dc232979776b9eb724597 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 23 Aug 2018 10:43:27 +0200
Subject: [PATCH] Bump Ushahidi version to 3.12.1

---
 ushahidi/Dockerfile                     | 15 +++++++++++----
 ushahidi/docker/srv/ushahidi/aura.patch | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 ushahidi/docker/srv/ushahidi/aura.patch

diff --git a/ushahidi/Dockerfile b/ushahidi/Dockerfile
index eb68828..89a2a54 100644
--- a/ushahidi/Dockerfile
+++ b/ushahidi/Dockerfile
@@ -7,17 +7,24 @@ RUN \
 
 RUN \
  # Download Ushahidi
- wget https://github.com/ushahidi/platform-release/releases/download/v3.8.0/ushahidi-platform-release-v3.8.0.tar.gz -O /tmp/ushahidi.tgz \
+ wget https://github.com/ushahidi/platform-release/releases/download/v3.12.1/ushahidi-platform-release-v3.12.1.tar.gz -O /tmp/ushahidi.tgz \
  && tar xzf /tmp/ushahidi.tgz -C /tmp \
- && mv /tmp/ushahidi-platform-release-v3.8.0/html /srv/ushahidi \
+ && mv /tmp/ushahidi-platform-release-v3.12.1/html /srv/ushahidi \
  # Create OS user
  && addgroup -S -g 8014 ushahidi \
  && adduser -S -u 8014 -h /srv/ushahidi -s /bin/false -g ushahidi -G ushahidi ushahidi \
  && chown -R ushahidi:ushahidi /srv/ushahidi/platform/application/logs /srv/ushahidi/platform/application/cache /srv/ushahidi/platform/application/media/uploads \
  # Cleanup
- && rm -rf /tmp/ushahidi.tgz /tmp/ushahidi-platform-release-v3.8.0
+ && rm -rf /tmp/ushahidi.tgz /tmp/ushahidi-platform-release-v3.12.1
 
-COPY docker/ /
+COPY docker/etc/ /etc/
+
+COPY --chown=8014:8014 docker/srv/ushahidi/ /srv/ushahidi/
+
+RUN \
+ # Patch Previewers
+ cd /srv/ushahidi \
+ && patch -p0 <aura.patch
 
 VOLUME ["/srv/ushahidi/platform/application/media/uploads"]
 EXPOSE 8080
diff --git a/ushahidi/docker/srv/ushahidi/aura.patch b/ushahidi/docker/srv/ushahidi/aura.patch
new file mode 100644
index 0000000..68e2e3e
--- /dev/null
+++ b/ushahidi/docker/srv/ushahidi/aura.patch
@@ -0,0 +1,11 @@
+--- original/vendor/aura/di/src/Factory.php
++++ platform/vendor/aura/di/src/Factory.php
+@@ -619,7 +619,7 @@
+         } while ($entity = get_parent_class($entity));
+ 
+         // get traits from ancestor traits
+-        while (list($trait) = each($traits)) {
++        foreach ($traits as $trait => $_) {
+             foreach (class_uses($trait) as $key => $name) {
+                 $traits[$key] = $name;
+             }