From bbddef8d92400957cd6e69d41822680313812d2b Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Sat, 18 Feb 2017 11:51:44 +0100
Subject: [PATCH] New base image, extensions

---
 Dockerfile | 9 ++++++++-
 start.sh   | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 412594c..83ecd94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cloudron/base:0.9.0
+FROM cloudron/base:0.10.0
 MAINTAINER Rainloop Developers <support@cloudron.io>
 
 EXPOSE 8000
@@ -8,6 +8,7 @@ RUN apt-get update \
        libapache2-mod-php mysql-client php-mysql
 
 ENV VERSION 1.6.2
+ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
@@ -19,6 +20,12 @@ RUN mkdir -p /app/data \
     && mv data data-orig \
     && ln -s /app/data data
 
+RUN mkdir /app/code/extensions-orig \
+    && wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
+    | tar -xz --strip-components=1 -C /app/code/extensions-orig \
+    && rm -rf /app/code/extensions \
+    && ln -s /app/data/extensions /app/code/extensions
+
 ADD apache2.conf /etc/apache2/sites-available/freshrss.conf
 
 RUN rm /etc/apache2/sites-enabled/* \
diff --git a/start.sh b/start.sh
index 3c7973b..2ecea96 100755
--- a/start.sh
+++ b/start.sh
@@ -25,6 +25,13 @@ EOF
   echo "Done."
 fi
 
+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
+done
+
 echo "Creating config file"
 SALT=$(cat /app/data/.salt)
 cat > /app/data/config.php <<EOF