Version 1.9.0

https://github.com/FreshRSS/FreshRSS/issues/2233

CHANGELOG

@@ -88,3 +88,72 @@
 * Fix security issue where root directory was exposed
 * Enable mod rewrite for mobile apps like FeedMe to work
 
+[1.5.1]
+* Update FreshRSS to 1.13.1
+
+[1.6.0]
+* Update FreshRSS to 1.14.0
+* Update extensions to 0812ee05c24c
+
+[1.6.1]
+* Update FreshRSS to 1.14.1
+* Fix load more articles when using ascending order #2314
+* Fix the use of arrow keyboard keys for shortcuts #2316
+* Fix control+click or middle-click for opening articles in a background tab #2310
+* Fix the naming of the option to unfold categories #2307
+* Fix shortcut problem when using unfolded articles #2328
+* Fix auto-hiding articles #2323
+* Fix scroll functions with Edge #2337
+* Fix drop-down menu warning #2353
+* Fix delay for individual mark-as-read actions #2332
+* Fix scroll functions in Edge #2337
+
+[1.6.2]
+* Update FreshRSS to 1.14.2
+* Fix minor code syntax warning in API #2362
+
+[1.6.3]
+* Update FreshRSS to 1.14.3
+* New configuration page for each category #2369
+* Update shortcut configuration page #2405
+* CSS style for printing #2149
+* Do not hide multiple <br /> tags #2437
+* Updated to jQuery 3.4.1 (only for statistics page) #2424
+
+[1.7.0]
+* Update FreshRSS to 1.15.0
+* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels #2335
+* New option to control category sort order #2592
+* New option to display article authors underneath the article title #2487
+* Add e-mail capability #2476, #2481
+* Ability to define default user settings in data/config-user.custom.php #2490
+* Including default feeds #2515
+* Allow recreating users if they still exist in database #2555
+* Add optional database connection URI parameters #2549, #2559
+* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) #2448
+* Add support for terms of service #2520
+* Add sharing with Lemmy #2510
+
+[1.7.1]
+* Update FreshRSS to 1.15.1
+
+[1.7.2]
+* Update FreshRSS to 1.15.2
+
+[1.7.3]
+* Update FreshRSS to 1.15.3
+
+[1.8.0]
+* Update FreshRSS to 1.16.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.0)
+* Allow multiple users to have administration rights #2096
+* Preview the CSS rule to retrieve full article content #2778
+* Improve CSS selector ordering in the full-text retrieval (lib_phpQuery) #2874
+* New search option !date: allowing to exclude any date interval #2869
+* New option to show all articles in the favourites view #2434
+* 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
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.5.0",
+  "version": "1.9.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -18,7 +18,7 @@
       }
     }
   },
-  "manifestVersion": 1,
+  "manifestVersion": 2,
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",

DESCRIPTION.md

@@ -1,4 +1,6 @@
-This app packages FreshRSS <upstream>1.13.0</upstream>.
+This app packages FreshRSS <upstream>1.16.0</upstream>.
+
+## About
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 
@@ -6,12 +8,12 @@ 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 +21,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,14 +1,15 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
+FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.13.0.tar.gz | tar -zxvf - --strip-components=1
+ARG VERSION=1.16.0
+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
 
 # official extensions
-RUN wget https://github.com/FreshRSS/Extensions/archive/2d0358e75961cbfcac7c2cbe09b098905ff67803.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/de83a1096c10644098291539cabfbecd38d5a28f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
     mv /app/code/extensions /app/code/extensions-orig && \
     ln -s /app/data/extensions /app/code/extensions
 
@@ -21,18 +22,16 @@ RUN a2disconf other-vhosts-access-log
 ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
 RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
-RUN a2enmod headers expires deflate mime dir rewrite
+RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
-RUN rm -rf /var/lib/php \
-    && ln -s /run/php /var/lib/php \
-    && mkdir -p /run/php/session
+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 && \
-    crudini --set /etc/php/7.2/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.2/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.2/apache2/php.ini Session session.gc_divisor 100
+RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
+    crudini --set /etc/php/7.3/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/7.3/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
 
 ADD start.sh /app/code/start.sh
 

start.sh

@@ -2,51 +2,46 @@
 
 set -eu
 
-mkdir -p /run/php/sessions
+mkdir -p /run/php/session
 
 if ! [ -f /app/data/.installed ]; then
-  echo "Fresh installation, setting up..."
-  rsync -a /app/code/data-orig/ /app/data/
-  php cli/do-install.php \
-    --environment production --default_user admin \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
-    --disable_update
-  php cli/create-user.php --user admin --password changeme --language en
-  php cli/actualize-user.php --user admin
-  touch /app/data/.installed
-  echo "Done."
+    echo "==> Fresh installation, setting up..."
+    rsync -a /app/code/data-orig/ /app/data/
+    php cli/do-install.php \
+      --environment production --default_user admin \
+      --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
+      --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
+      --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
+      --disable_update
+    php cli/create-user.php --user admin --password changeme --language en
+    touch /app/data/.installed
+    echo "==> Done."
 fi
 
-
-echo "Symlinking log file"
+echo "==> Symlinking log file"
 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
 
 # We have to copy instead of symlinking extensions (see #2)
-echo "Copying packaged extensions"
+echo "==> Copying packaged extensions"
 mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
     rm -rf "/app/data/extensions/$f"
     cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
 done
 
-
-echo "Updating config file"
-php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+echo "==> Updating config file"
+php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \
+    --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
+    --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
+    --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
     --disable_update
 
-
-echo "Setting permissions"
+echo "==> Setting permissions"
 chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
 
-
-echo "Starting apache"
+echo "==> Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars
 rm -f "${APACHE_PID_FILE}"
 exec /usr/sbin/apache2 -DFOREGROUND

test/test.js

@@ -73,9 +73,7 @@ describe('Application life cycle test', function () {
     }
 
     function login(password, callback) {
-        clearCache().then(function () {
-            return browser.get('https://' + app.fqdn);
-        }).then(function () {
+        browser.get('https://' + app.fqdn).then(function () {
             return visible(by.id('loginButton'));
         }).then(function () {
             return browser.findElement(by.id('username')).sendKeys(username);
@@ -153,8 +151,10 @@ describe('Application life cycle test', function () {
     }
 
     function checkApiConfiguration(callback) {
-        browser.get(`${baseUrl()}/api/greader.php/check%2Fcompatibility`).then(function () {
-            return exists(by.xpath('//pre[text()="PASS"]'));
+        browser.get(`${baseUrl()}/api/`).then(function () {
+            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+        }).then(function () {
+            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
         }).then(function () {
             callback();
         });
@@ -190,7 +190,7 @@ describe('Application life cycle test', function () {
     });
 
     it('install app', function () {
-        execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can get app information', getAppInfo);
@@ -220,7 +220,7 @@ describe('Application life cycle test', function () {
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --wait --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
         expect(app).to.be.an('object');
@@ -238,22 +238,22 @@ describe('Application life cycle test', function () {
 
     // test update
     it('can install app', function () {
-        execSync('cloudron install --new --wait --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can get app information', getAppInfo);
-    it('can login', login.bind(null, 'password'));
+    it('can login', login.bind(null, password));
     it('can subscribe', addSubscription);
     it('can add users', addUser.bind(null, password));
 
     it('can update', function () {
-        execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
         expect(app).to.be.an('object');
     });
 
-    it('can login', login.bind(null, 'password'));
+    it('can login', login.bind(null, password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);