From 62182d519bf3375b1e0e7fa22db777a740cbf08d Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 31 May 2018 09:36:49 -0700
Subject: [PATCH] Apply extensions_path fix

Part of #2
---
 Dockerfile | 5 ++---
 start.sh   | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index acfd4d2..d651803 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,14 +4,13 @@ RUN apt-get update \
     && apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
        libapache2-mod-php mysql-client php-mysql
 
-ENV VERSION 1.10.2
 ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN wget "https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz" -O - | tar -xz --strip-components=1 && \
-    sed -e "s|define('EXTENSIONS_PATH'.*);|define('EXTENSIONS_PATH', '/app/data/extensions');|" -i /app/code/constants.php
+# contains fix for extensions_path (see #2)
+RUN curl -L https://github.com/cloudron-io/FreshRSS/archive/2c7c367a5b38870e3250b1359ead3c2665410f89.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
 
diff --git a/start.sh b/start.sh
index 6f3b4d7..41aea4f 100755
--- a/start.sh
+++ b/start.sh
@@ -25,13 +25,12 @@ rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt
 ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
 
-
-echo "Symlinking packaged extensions"
+# We have to copy instead of symlinking extensions (see #2)
+echo "Copying packaged extensions"
 mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
-  if ! [ -e "/app/data/extensions/$f" ]; then
-    ln -s "/app/code/extensions-orig/$f" "/app/data/extensions/$f"
-  fi
+    rm -rf "/app/data/extensions/$f"
+    cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
 done