Bump version to 1.11.1

This reverts commit 8ba346c847.

It seems they reverted this release

CHANGELOG

@@ -161,3 +161,33 @@
 [1.9.0]
 * Update Syncthing to 1.6.1
 
+[1.10.0]
+* Update Syncthing to 1.7.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.7.0)
+* #6552: panic: Stop called more than once on ... created by nat.Service
+* #6564: Closing an already removed connection causes GUI error message
+* #6646: Misleading error message when to be deleted dir contains receive-only changes
+* #6653: panic: nil pointer dereference in leveldb.(*DB).isClosed()
+
+[1.11.0]
+* Update Syncthing to 1.9.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.9.0)
+* Offline nodes after drive replacement automatically heal and join back into the cluster, refer #10416
+* Listing improvements with parallel disk.Walk calls across many nodes, refer #10420
+* certs now supports multiple domains for TLS termination, refer #10207
+* Context now passed around at storage layer for future context support, refer #10321
+
+[1.12.0]
+* Update Syncthing to 1.11.1
+* #6880: fatal error: concurrent map iteration and map write
+* #6917: Reconsider db check on upgrade
+* #6930: Can't add new folder with versioning enabled, Cleanup Interval field lacks default value
+* #6940: TypeError: Object doesn't support property or method 'startsWith' in IE 11 / Windows 7
+* #6943: Missing strings for translation
+* #6961: Accounting issue with receive-only deleted files causing spurious 95% completion for remote devices
+* #6968: Very slow scans on Windows in 1.9.0
+* #6972: Deleting a folder containing a symlink results in a permanently out of sync on windows
+* #6973: given name "syncthingxxx.tmp" differs from name in filesystem "syncthingXXX.tmp"
+* #4277: Announce internal and external address to the global discovery service, encrypted
+* #6734: Consider moving configuration to a proto contract
+* #6928: Announce LAN addresses to global discovery

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "1.9.0",
+  "version": "1.12.0",
   "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {
@@ -27,12 +27,13 @@
     "storage",
     "sync"
   ],
-  "minBoxVersion": "4.1.4",
-  "documentationUrl": "https://cloudron.io/documentation/apps/syncthing/",
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/56/syncthing",
+  "documentationUrl": "https://docs.cloudron.io/apps/syncthing/",
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/1.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/2.png",
-    "https://s3.amazonaws.com/cloudron-app-screenshots/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/3.png"
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/1.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/3.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Syncthing <upstream>1.6.1</upstream>.
+This app packages Syncthing <upstream>1.11.1</upstream>.
 
 Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
 
-ARG VERSION=1.6.1
+ARG VERSION=1.11.1
 
 RUN mkdir -p /app/code
 WORKDIR /app/code

POSTINSTALL.md

@@ -1,8 +1,7 @@
-Use the following credentials for initial setup:
+This app is pre-setup with an admin account. The initial credentials are:
 
-`username`: admin
+**Username**: admin<br/>
+**Password**: changeme<br/>
 
-`password`: changeme
-
-**Please change the admin password on first login**
+Please change the admin password immediately.
 

test/package.json

@@ -9,14 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^83.0.0",
-    "ejs": "^3.1.3",
+    "chromedriver": "^86.0.0",
     "expect.js": "^0.3.1",
-    "mkdirp": "^1.0.4",
-    "mocha": "^7.2.0",
-    "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^3.141.59",
+    "mocha": "^8.2.1",
     "selenium-webdriver": "^3.6.0",
-    "superagent": "^5.2.2"
+    "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -13,55 +13,39 @@ var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     superagent = require('superagent'),
     path = require('path'),
-    webdriver = require('selenium-webdriver');
-
-var by = require('selenium-webdriver').By,
-    until = require('selenium-webdriver').until,
-    Key = require('selenium-webdriver').Key,
-    Builder = require('selenium-webdriver').Builder;
+    { Builder, By, Key, until } = require('selenium-webdriver'),
+    { Options } = require('selenium-webdriver/chrome');
 
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var server, browser = new Builder().forBrowser('chrome').build();
-    var username = 'admin', password = 'changeme';
-
-    before(function (done) {
-        var seleniumJar= require('selenium-server-standalone-jar');
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
-
-        done();
-    });
-
-    after(function (done) {
-        browser.quit();
-        server.stop();
-        done();
-    });
-
     var LOCATION = 'test';
     var TEST_TIMEOUT = 30000;
     var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
     var SYNC_PORT = 22001;
     var EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
+    var browser;
     var app;
+    var username = 'admin', password = 'changeme';
+
+    before(function () {
+        browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
+    });
+
+    after(function () {
+        browser.quit();
+    });
 
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
         expect(app).to.be.an('object');
     }
 
-    function pageLoaded() {
-        return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
-    }
-
-    function visible(selector) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
+    function waitForElement(elem) {
+        return browser.wait(until.elementLocated(elem), TEST_TIMEOUT).then(function () {
+            return browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
         });
     }
 
@@ -75,13 +59,13 @@ describe('Application life cycle test', function () {
 
     function loadPage(callback) {
         browser.manage().deleteAllCookies().then(function () {
-            return browser.sleep(10000);
+            return browser.sleep(5000);
         }).then(function() {
             return browser.get('https://' + username + ':' + encodeURIComponent(password) + '@' + app.fqdn).then(function () {
                 return browser.get('https://' + app.fqdn);
             });
         }).then(function () {
-            return pageLoaded();
+            return waitForElement(By.xpath('//span[text()="Actions"]'));
         }).then(function () {
             callback();
         });
@@ -89,19 +73,19 @@ describe('Application life cycle test', function () {
 
     function addFolder(callback) {
         browser.get('https://' + app.fqdn).then(function () {
-            return browser.findElement(by.css('[ng-click*=addFolder]')).click();
+            return browser.findElement(By.css('[ng-click*=addFolder]')).click();
         }).then(function () {
-            return visible(by.id('folderPath'));
+            return waitForElement(By.id('folderPath'));
         }).then(function () {
             return browser.sleep(4000); // wait more, not sure why this is needed
         }).then(function() {
-            return browser.findElement(by.id('folderLabel')).sendKeys(FOLDER);
+            return browser.findElement(By.id('folderLabel')).sendKeys(FOLDER);
         }).then(function () {
             return browser.sleep(4000); // without this sometimes only part of the folder name gets through
         }).then(function() {
-            return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
+            return browser.findElement(By.css('[ng-click*=saveFolder]')).click();
         }).then(function() {
-            return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
         }).then(function () {
             return browser.sleep(4000);
         }).then(function() {
@@ -111,7 +95,7 @@ describe('Application life cycle test', function () {
 
     function checkFolder(callback) {
         browser.get('https://' + app.fqdn).then(function () {
-            return browser.wait(until.elementLocated(by.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
         }).then(function () {
             callback();
         });
@@ -119,21 +103,21 @@ describe('Application life cycle test', function () {
 
     function removeFolder(callback) {
         browser.get('https://' + app.fqdn).then(function () {
-            return pageLoaded();
+            return waitForElement(By.xpath('//span[text()="Actions"]'));
         }).then(function() {
-            return browser.findElement(by.css('#folders button')).click();
+            return browser.findElement(By.css('#folders button')).click();
         }).then(function () {
             return browser.sleep(3000); //No way to check for visibility of angular-js components
         }).then(function () {
-            return browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
+            return browser.findElement(By.css('#folder-0 button[ng-click*=editFolder]')).click();
         }).then(function () {
             return browser.sleep(3000); //No way to check for visibility of angular-js components
         }).then(function () {
-            return browser.findElement(by.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
+            return browser.findElement(By.xpath('//button[@data-target="#remove-folder-confirmation"]')).click();
         }).then(function () {
             return browser.sleep(3000); //No way to check for visibility of angular-js components
         }).then(function () {
-            return browser.findElement(by.css('[ng-click*=deleteFolder]')).click();
+            return browser.findElement(By.css('[ng-click*=deleteFolder]')).click();
         }).then(function () {
             return browser.sleep(3000); //This needs to run for some time
         }).then(function () {
@@ -141,11 +125,17 @@ describe('Application life cycle test', function () {
         });
     }
 
+    function wait (done) {
+        setTimeout(done, 10000);
+    }
+
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
 
     it('install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
+    it('wait', wait);
+
     it('fails with invalid password', invalidPassword);
     it('can load page', loadPage);
     it('can add folder', addFolder);
@@ -153,6 +143,8 @@ describe('Application life cycle test', function () {
     it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
     it('restore app', function () { execSync('cloudron restore --app ' + app.id, EXEC_ARGS); });
 
+    it('wait', wait);
+
     it('can load page', loadPage);
     it('can check folder', checkFolder);
 
@@ -165,6 +157,8 @@ describe('Application life cycle test', function () {
     });
     it('can get app information', getAppInfo);
 
+    it('wait', wait);
+
     it('can load page', loadPage);
     it('can check folder', checkFolder);
     it('can remove folder', removeFolder);
@@ -179,10 +173,11 @@ describe('Application life cycle test', function () {
     // test update
     it('can install app', function () { execSync('cloudron install --port-bindings SYNC_PORT=' + SYNC_PORT + ' --appstore-id net.syncthing.cloudronapp2 --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
+    it('wait', wait);
     it('can load page', loadPage);
     it('can add folder', addFolder);
     it('can update', function () { execSync('cloudron update --app ' + LOCATION, EXEC_ARGS); });
-    it('wait for app to startup fully', function (done) { setTimeout(done, 10000); });
+    it('wait', wait);
     it('can check folder', checkFolder);
 
     it('uninstall app', function (done) {