Version 1.18.4

This version is not yet available as a build

CHANGELOG

@@ -177,3 +177,83 @@
 * 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
+
+[1.12.1]
+* Update Syncthing to 1.12.0
+* #5360: Dangling symlink prevents filesystem watcher on FreeBSD
+* #6664: Panic due to internal folder context used on exported methods
+* #7063: panic: runtime error: invalid memory address or nil pointer dereference
+* #7077: GUI stuck with "id is not defined" error when trying to ignore non-existent folder
+* #7098: File deletions are not being synced in newly shared folders
+* #6540: Config PATCH/PUT/DELETE API
+* #7099: Add a html message to GUI when javascript is disabled
+* #7108: Certificate for relaysrv with better naming
+
+[1.13.0]
+* Update base image to v3
+
+[1.14.0]
+* Update Syncthing to 1.14.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.14.0)
+
+[1.15.0]
+* Update Syncthing to 1.15.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.0)
+
+[1.15.1]
+* Update Syncthing to 1.15.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.15.1)
+
+[1.16.0]
+* Update Syncthing to 1.16.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.0)
+
+[1.16.1]
+* Update Syncthing to 1.16.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.16.1)
+
+[1.17.0]
+* Update Syncthing to 1.17.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.17.0)
+
+[1.18.0]
+* Update Syncthing to 1.18.0
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.0)
+
+[1.18.1]
+* Update Syncthing to 1.18.1
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.1)
+
+[1.18.2]
+* Update Syncthing to 1.18.2
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.2)
+* #7827: The error message "given name ... differs from filesystem name ..." does not help users to resolve the issue
+* #7893: Updating ignores blocks GUI when IO slots are unavailable
+
+[1.18.3]
+* Update Syncthing to 1.18.3
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.3)
+
+[1.18.4]
+* Update Syncthing to 1.18.4
+* [Full changelog](https://github.com/syncthing/syncthing/releases/tag/v1.18.4)
+* #7991: Encryption trailer not updated on shortcut
+* #7994: Index "out of sync with reality" on receive-encrypted folder
+* #8000: stdiscosrv + strelaysrv systemd services not restarting on upgrade
+* #8012: Not retrying to sync when a new connection is established
+
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "1.11.0",
+  "version": "1.18.4",
   "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {
@@ -29,11 +29,11 @@
   ],
   "minBoxVersion": "5.3.0",
   "forumUrl": "https://forum.cloudron.io/category/56/syncthing",
-  "documentationUrl": "https://cloudron.io/documentation/apps/syncthing/",
+  "documentationUrl": "https://docs.cloudron.io/apps/syncthing/",
   "mediaLinks": [
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/1.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/1.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/2.png",
+    "https://screenshots.cloudron.io/net.syncthing.cloudronapp2/2.png",
-    "https://cloudron-app-screenshots.s3.amazonaws.com/net.syncthing.cloudronapp2/53bc9300d71bb5bf32362f8213194a0c3a415429/3.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.9.0</upstream>.
+This app packages Syncthing <upstream>1.18.4</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,10 +1,10 @@
-FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
+FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
-
-ARG VERSION=1.9.0
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
+ARG VERSION=1.18.4
+
 RUN wget https://github.com/syncthing/syncthing/releases/download/v${VERSION}/syncthing-linux-amd64-v${VERSION}.tar.gz -O - | tar -xz -C /app/code --strip-components=1
 
 # add supervisor configs

POSTINSTALL.md

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

start.sh

@@ -26,4 +26,4 @@ sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/
 chown -R cloudron:cloudron /app/data /run/syncthing
 
 echo "Starting supervisor"
-exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i GitLab
+exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i syncthing

test/package.json

@@ -9,13 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^85.0.0",
+    "chromedriver": "^95.0.0",
     "expect.js": "^0.3.1",
-    "mkdirp": "^1.0.4",
+    "mocha": "^9.1.3",
-    "mocha": "^8.1.3",
+    "selenium-webdriver": "^4.0.0",
-    "rimraf": "^3.0.2",
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^3.6.0",
     "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -1,67 +1,52 @@
 #!/usr/bin/env node
 
-'use strict';
+/* jshint esversion: 8 */
-
 /* global describe */
 /* global before */
 /* global after */
 /* global it */
 
+'use strict';
+
 require('chromedriver');
 
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     superagent = require('superagent'),
     path = require('path'),
-    webdriver = require('selenium-webdriver');
+    { Builder, By, Key, until } = require('selenium-webdriver'),
-
+    { Options } = require('selenium-webdriver/chrome');
-var by = require('selenium-webdriver').By,
-    until = require('selenium-webdriver').until,
-    Key = require('selenium-webdriver').Key,
-    Builder = require('selenium-webdriver').Builder;
 
 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() {
+    function waitForElement(elem) {
-        return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
+        return browser.wait(until.elementLocated(elem), TEST_TIMEOUT).then(function () {
-    }
+            return browser.wait(until.elementIsVisible(browser.findElement(elem)), 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);
         });
     }
 
@@ -75,13 +60,17 @@ 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 browser.sleep(5000);
+        }).then(function () {
+            return browser.get('https://' + app.fqdn);
+        }).then(function () {
+            return waitForElement(By.xpath('//span[text()="Actions"]'));
         }).then(function () {
             callback();
         });
@@ -89,19 +78,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 +100,11 @@ 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.sleep(5000);
+        }).then(function () {
+            return browser.get('https://' + app.fqdn);
+        }).then(function () {
+            return browser.wait(until.elementLocated(By.xpath(`//span[text()="${FOLDER}"]`)), TEST_TIMEOUT);
         }).then(function () {
             callback();
         });
@@ -119,21 +112,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,54 +134,64 @@ 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);
 
     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('restore app', async function () {
+        await browser.get('about:blank');
+        execSync('cloudron restore --app ' + app.id, EXEC_ARGS);
+    });
+
+    it('wait', wait);
 
     it('can load page', loadPage);
     it('can check folder', checkFolder);
 
-    it('move to different location', function (done) {
+    it('move to different location', async function () {
-        // ensure we don't hit NXDOMAIN in the mean time
+        await browser.get('about:blank');
-        browser.get('about:blank').then(function () {
+        execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
-            execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS);
-            done();
-        });
     });
     it('can get app information', getAppInfo);
 
+    it('wait', wait);
+
     it('can load page', loadPage);
     it('can check folder', checkFolder);
     it('can remove folder', removeFolder);
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
-            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 
     // 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('can update', async function () {
-    it('wait for app to startup fully', function (done) { setTimeout(done, 10000); });
+        await browser.get('about:blank');
+        execSync('cloudron update --app ' + LOCATION, EXEC_ARGS);
+    });
+    it('wait', wait);
     it('can check folder', checkFolder);
 
-    it('uninstall app', function (done) {
+    it('uninstall app', async function () {
-        browser.get('about:blank').then(function () {
+        await browser.get('about:blank');
-            execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-            done();
-        });
     });
 });