Version 1.11.0

CHANGELOG

@@ -168,3 +168,15 @@
 [1.10.0]
 * Add forum url and update screenshot links
 
+[1.11.0]
+* Update FreshRSS to 1.17.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
+* New tag management page #3121
+* New page to add feeds and categories #3027
+* Add a way to disable/enable users #3056
+* Fix special characters in user queries #3037
+* Hide feed credentials when adding a new feed #3099
+* Trim whitespace for feed passwords #3158
+* Updated PHPMailer library to 6.1.6 #3024
+* Add blogger.com to the default list of forced HTTPS #3088
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -24,7 +24,7 @@
   "icon": "logo.png",
   "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
   "mediaLinks": [
-    "https://cloudron-app-screenshots.s3.amazonaws.com/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
+    "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
   "minBoxVersion": "5.3.0",

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.16.2</upstream>.
+This app packages FreshRSS <upstream>1.17.0</upstream>.
 
 ## About
 

Dockerfile

@@ -3,13 +3,13 @@ FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.16.2
+ARG VERSION=1.17.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/de83a1096c10644098291539cabfbecd38d5a28f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.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
 
@@ -33,6 +33,9 @@ RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
     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
 
+RUN ln -s /app/data/php.ini /etc/php/7.3/apache2/conf.d/99-cloudron.ini && \
+    ln -s /app/data/php.ini /etc/php/7.3/cli/conf.d/99-cloudron.ini
+
 ADD start.sh /app/code/start.sh
 
 CMD [ "/app/code/start.sh" ]

POSTINSTALL.md

@@ -1,7 +1,7 @@
 This app is pre-setup with an admin account. The initial credentials are:
   
-**Username**: admin <br/>
-**Password**: changeme <br/>
+**Username**: admin<br/>
+**Password**: changeme<br/>
 
 Please change the admin password immediately.
 

start.sh

@@ -18,6 +18,10 @@ if ! [ -f /app/data/.installed ]; then
     echo "==> Done."
 fi
 
+if [[ ! -f /app/data/php.ini ]]; then
+    echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
+fi
+
 echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt

test/test.js

@@ -108,14 +108,15 @@ describe('Application life cycle test', function () {
     }
 
     function addSubscription(callback) {
-        var url = "https://cloudron.io/blog/rss.xml";
+        var url = 'https://blog.cloudron.io/rss/';
+        const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
 
-        browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
+        browser.get(addUrl).then(function () {
             return visible(by.xpath('//input[@name="url_rss"]'));
         }).then(function () {
             return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
         }).then(function () {
-            return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
+            return browser.findElement(by.xpath('//button[@type="submit"]/ancestor::form[@id="add_rss"]')).submit();
         }).then(function () {
             return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
         }).then(function () {
@@ -169,7 +170,7 @@ describe('Application life cycle test', function () {
 
     function subscriptionExists(callback) {
         browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
-            return visible(by.xpath('//a[text()="Cloudron.io"]'));
+            return visible(by.xpath('//span[text()="Cloudron"]'));
         }).then(function () {
             callback();
         });