Version 1.6.3

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

CHANGELOG

@@ -88,3 +88,35 @@
 * 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
+

CloudronManifest.json

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

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.13.0</upstream>.
+This app packages FreshRSS <upstream>1.14.3</upstream>.
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 

Dockerfile

@@ -3,12 +3,12 @@ FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c
 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
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.14.3.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/0812ee05c24c5610e4a9fefbef372d49dafb447f.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,11 +21,9 @@ 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 \
+RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
-    && ln -s /run/php /var/lib/php \
-    && mkdir -p /run/php/session
 
 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 && \

start.sh

@@ -2,10 +2,10 @@
 
 set -eu
 
-mkdir -p /run/php/sessions
+mkdir -p /run/php/session
 
 if ! [ -f /app/data/.installed ]; then
-  echo "Fresh installation, setting up..."
+    echo "==> Fresh installation, setting up..."
     rsync -a /app/code/data-orig/ /app/data/
     php cli/do-install.php \
       --environment production --default_user admin \
@@ -16,17 +16,17 @@ if ! [ -f /app/data/.installed ]; then
     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 "==> 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"
@@ -34,7 +34,7 @@ for f in $(ls /app/code/extensions-orig); do
 done
 
 
-echo "Updating config file"
+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}" \
@@ -42,11 +42,11 @@ php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}"
     --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 () {
+        browser.get('https://' + app.fqdn).then(function () {
-            return 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 () {
+        browser.get(`${baseUrl()}/api/`).then(function () {
-            return exists(by.xpath('//pre[text()="PASS"]'));
+            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();
         });
@@ -242,7 +242,7 @@ describe('Application life cycle test', function () {
     });
 
     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));
 
@@ -253,7 +253,7 @@ describe('Application life cycle test', function () {
         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);