Version 1.10.0

CHANGELOG

@@ -154,3 +154,17 @@
 * Allow feed to be actualized just after being truncated #2862
 * Fallback to showing a GUID when an article title is empty #2813
 
+[1.9.0]
+* Use latest base image 2.0.0
+
+[1.9.1]
+* Update FreshRSS to 1.16.2
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.1)
+* Add the possibility to filter by feed IDs #2892
+  * like f:123 more-search or multiple feed IDs like f:123,234,345 more-search or an exclusion like !f:456,789 more-search
+* Show users last activity date #2936
+* Ability to follow HTML redirections when retrieving full article content #2985
+
+[1.10.0]
+* Add forum url and update screenshot links
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -22,18 +22,12 @@
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [
+  "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
-    "rss",
-    "atom",
-    "greader",
-    "reader",
-    "news",
-    "feeds"
-  ],
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
+    "https://cloudron-app-screenshots.s3.amazonaws.com/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "2.0.0",
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
 }

DESCRIPTION.md

@@ -1,4 +1,6 @@
-This app packages FreshRSS <upstream>1.16.0</upstream>.
+This app packages FreshRSS <upstream>1.16.2</upstream>.
+
+## About
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 
@@ -6,12 +8,13 @@ It is at the same time lightweight, easy to work with, powerful and customizable
 
 It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
 
-### Extensions
+## Extensions
+
 FreshRSS supports further customizations by adding extensions on top of its core functionality.
 See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
 
 
-### Compatible clients
+## Compatible clients
 Any client supporting a Google Reader-like API. Selection:
 
 * Android
@@ -19,3 +22,6 @@ Any client supporting a Google Reader-like API. Selection:
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
+* Mac/iOS
+    * [Reeder](https://reederapp.com/)
+

Dockerfile

@@ -1,9 +1,9 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
+FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.16.0
+ARG VERSION=1.16.2
 RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
@@ -26,12 +26,12 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
 RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.2/apache2/php.ini PHP upload_max_filesize 64M && \
+RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/7.3/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/7.3/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.2/apache2/php.ini Session session.gc_divisor 100
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -1,10 +1,7 @@
-This application does not integrate with Cloudron authentication.
+This app is pre-setup with an admin account. The initial credentials are:
   
-There is a preconfigured administrator account with the following credentials:
+**Username**: admin <br/>
+**Password**: changeme <br/>
 
-* Username: `admin`
+Please change the admin password immediately.
-* Password: `changeme`
 
-(Please change that password on first login)
-
-You can create more accounts withing the app when logged in as administrator.

test/package.json

@@ -9,14 +9,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^2.38.3",
+    "chromedriver": "^84.0.0",
-    "ejs": "^2.4.2",
+    "ejs": "^3.1.3",
     "expect.js": "^0.3.1",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
-    "mocha": "^2.5.3",
+    "mocha": "^8.0.1",
-    "rimraf": "^2.5.3",
+    "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^2.53.1",
+    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^2.53.3",
+    "selenium-webdriver": "^3.6.0",
-    "superagent": "^1.8.5"
+    "superagent": "^5.3.1"
   }
 }

test/test.js

@@ -11,7 +11,9 @@ var execSync = require('child_process').execSync,
     webdriver = require('selenium-webdriver');
 
 var by = webdriver.By,
-    until = webdriver.until;
+    Keys = webdriver.Key,
+    until = webdriver.until,
+    Builder = require('selenium-webdriver').Builder;
 
 var username = 'admin',
     password = 'changeme';
@@ -22,8 +24,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var chrome = require('selenium-webdriver/chrome');
+    var server, browser = new Builder().forBrowser('chrome').build();
-    var server, browser = new chrome.Driver();
 
     before(function (done) {
         var seleniumJar= require('selenium-server-standalone-jar');
@@ -209,7 +210,11 @@ describe('Application life cycle test', function () {
     });
 
     it('restore app', function () {
-        execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        const backups = JSON.parse(execSync('cloudron backup list --raw'));
+        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        getAppInfo();
+        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can login', login.bind(null, password));