v0.2.0

CHANGELOG

@@ -1,2 +1,6 @@
 [0.1.0]
 * Initial version
+
+[0.2.0]
+* Updated to base image 0.10.0
+* Supporting extensions

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {

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,15 @@ RUN mkdir -p /app/data \
     && mv data data-orig \
     && ln -s /app/data data
 
+ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch
+
+RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
+    | tar -xz --strip-components=1 -C /app/code/extensions \
+    && patch -p1 -d /app/code/extensions < /app/code/change-ttrss-file-path.patch \
+    && mv /app/code/extensions /app/code/extensions-orig \
+    && ln -s /app/data/extensions /app/code/extensions \
+    && ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
+
 ADD apache2.conf /etc/apache2/sites-available/freshrss.conf
 
 RUN rm /etc/apache2/sites-enabled/* \

README.md

@@ -6,7 +6,7 @@ This repository contains the Cloudron app package source for [FreshRSS](http://w
 
 [![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=org.freshrss.cloudronapp)
 
-or using the [Cloudron command line tooling](https://cloudron.io/references/cli.html)
+or using the [Cloudron command line tooling](https://git.cloudron.io/cloudron/cloudron-cli/)
 
 ```
 cloudron install --appstore-id org.freshrss.cloudronapp
@@ -14,7 +14,7 @@ cloudron install --appstore-id org.freshrss.cloudronapp
 
 ## Building
 
-The app package can be built using the [Cloudron command line tooling](https://cloudron.io/references/cli.html).
+The app package can be built using the [Cloudron command line tooling](https://git.cloudron.io/cloudron/cloudron-cli/).
 
 ```
 cd freshrss-app

change-ttrss-file-path.patch

@@ -0,0 +1,21 @@
+diff -ru extensions-orig/xExtension-TTRSS_API/extension.php extensions/xExtension-TTRSS_API/extension.php
+--- extensions-orig/xExtension-TTRSS_API/extension.php	2016-12-15 10:24:17.000000000 +0000
++++ extensions/xExtension-TTRSS_API/extension.php	2017-02-18 13:06:59.640761922 +0000
+@@ -9,7 +9,7 @@
+ 	public function install() {
+ 		$filename = 'ttrss.php';
+ 		$file_source = join_path($this->getPath(), $filename);
+-		$path_destination = join_path(PUBLIC_PATH, 'api');
++		$path_destination = '/app/data/extensions';
+ 		$file_destination = join_path($path_destination, $filename);
+ 
+ 		if (!is_writable($path_destination)) {
+@@ -35,7 +35,7 @@
+ 
+ 	public function uninstall() {
+ 		$filename = 'ttrss.php';
+-		$file_destination = join_path(PUBLIC_PATH, 'api', $filename);
++		$file_destination = join_path('/app/data/extensions', $filename);
+ 
+ 		if (file_exists($file_destination) && !unlink($file_destination)) {
+ 			return 'API file cannot be removed';

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