Version 3.10.1

this allows subdomain style bucket access

CloudronManifest.json

@@ -5,24 +5,33 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "1.111.0",
+  "version": "3.10.1",
+  "upstreamVersion": "2023-12-06T09-09-22Z",
   "healthCheckPath": "/minio/login",
+  "memoryLimit": 805306368,
   "httpPort": 8000,
+  "httpPorts": {
+    "API_SERVER_DOMAIN": {
+      "title": "API Server Domain",
+      "description": "The domain name for MinIO (S3) API requests",
+      "containerPort": 9000,
+      "defaultValue": "minio-api"
+    }
+  },
   "addons": {
     "localstorage": {}
   },
   "manifestVersion": 2,
   "website": "http://www.minio.io",
-  "minBoxVersion": "4.1.4",
-  "documentationUrl": "https://cloudron.io/documentation/apps/minio/",
+  "minBoxVersion": "7.1.2",
+  "forumUrl": "https://forum.cloudron.io/category/69/minio",
+  "documentationUrl": "https://docs.cloudron.io/apps/minio/",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [
-    "storage",
-    "hosting"
-  ],
+  "tags": [ "storage", "hosting", "s3", "objectstore" ],
   "mediaLinks": [
-    "https://raw.githubusercontent.com/minio/minio/master/docs/screenshots/minio-browser.jpg"
+    "https://screenshots.cloudron.io/io.minio.cloudronapp/pic1.png",
+    "https://screenshots.cloudron.io/io.minio.cloudronapp/pic2.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,29 +1,29 @@
-This app packages Minio <upstream>2020-05-29T14-08-49Z</upstream>.
+## About
 
 Minio is a distributed object storage server built for cloud applications and devops.
 
-### Features
+## Features
 
-#### Amazon S3 Compatible
+### Amazon S3 Compatible
 
 Minio implements Amazon S3 v4 APIs. Minio also includes client SDKs and a console utility.
 
-#### Minimalist Design
+### Minimalist Design
 
 Minio is deeply influenced by minimalism. We believe that only simple things scale.
 
-#### Apache License 2.0
+### Apache License 2.0
 
 Minio is free software, released under Apache license v2.0. Minio has an active developer and user community.
 
-#### Lambda Functions
+### Lambda Functions
 
 Minio triggers Lambda functions through event notification service. In addition Minio also supports simple queueing service for AMQP, Elasticsearch, Redis, NATS and Postgres targets.
 
-#### Erasure Code & Bitrot Protection
+### Erasure Code & Bitrot Protection
 
 Minio protects data against hardware failures and silent data corruption using erasure code and checksums. You may lose half the number of drives and still recover from it.
 
-#### Written in Go
+### Written in Go
 
 Go is an emerging language of choice for modern cloud infrastructure projects. Go language enables Minio to be highly concurrent and lightweight.

Dockerfile

@@ -1,14 +1,16 @@
-FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
-
-ARG VERSION=RELEASE.2020-05-29T14-08-49Z
-
-RUN mkdir -p /app/code \
-    && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio \
-    && chmod +x /app/code/minio
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
+RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ADD start.sh /app/code/start.sh
-ADD minio-credentials /app/code/minio-credentials
+ARG VERSION=RELEASE.2023-12-06T09-09-22Z
+
+# sometimes here https://dl.min.io/server/minio/release/linux-amd64/archive/
+# RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio
+RUN wget https://dl.min.io/server/minio/release/linux-amd64/archive/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio
+# https://dl.min.io/client/mc/release/linux-amd64/
+RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /app/code/mc && chmod +x /app/code/mc
+
+COPY env.sh start.sh /app/code/
 
 CMD [ "/app/code/start.sh" ]

LICENSE.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

POSTINSTALL.md

@@ -1,8 +1,7 @@
-This application does not integrate with Cloudron authentication.
-
 Please use the following credentials to login:
 
-* AccessKey: `minioadmin`
-* SecretKey: `minioadmin`
+**Username**: minioadmin<br/>
+**Password**: minioadmin<br/>
+
+Please change the credentials immediately by following this [guide](https://cloudron.io/documentation/apps/minio/#admin-credentials).
 
-**Please change the credentials immediately following the docs**

README.md

@@ -34,3 +34,11 @@ npm install
 PATH=$PATH:node_modules/.bin mocha --bail test.js
 ```
 
+## Notes
+
+MinIO Console is an embedded web-based object browser built into MinIO Server
+
+## Multi-domain
+
+MINIO_DOMAIN=domain.com env var can be set to server DNS style requests as bucket.domain.com . This requires the platform code to set aliases for the httpPorts and not the primaryport.
+

env.sh

@@ -0,0 +1,9 @@
+# Add custom minio configuration to this file. Restart the app for changes to take effect.
+
+export CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'
+
+# See https://docs.min.io/minio/baremetal/reference/minio-server/minio-server.html#envvar.MINIO_ROOT_USER
+# You can use pwgen -1s 64 to generate usernames and passwords
+export MINIO_ROOT_USER=minioadmin
+export MINIO_ROOT_PASSWORD=minioadmin
+

minio-credentials

@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const fs = require('fs');
-
-const MINIO_CONFIG = '/app/data/data/.minio.sys/config/config.json';
-
-function usage() {
-    console.log('Usage:\n');
-    console.log('\tminio-credentials get');
-    console.log('\tminio-credentials set <access key> <secret key>');
-    console.log();
-}
-
-let config = JSON.parse(fs.readFileSync(MINIO_CONFIG, 'utf8'));
-let adminCredentials = config['credentials']['_'];
-let accessKey = adminCredentials.filter(kv => kv.key === 'access_key')[0];
-let secretKey = adminCredentials.filter(kv => kv.key === 'secret_key')[0];
-
-if (process.argv[2] === 'get') {
-    console.log('Access Key:', accessKey.value);
-    console.log('Secret Key:', secretKey.value);
-} else if (process.argv[2] === 'set') {
-    if (process.argv.length !== 5) return usage();
-
-    // https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateAccessKey.html
-    if (process.argv[4].length < 5) return console.log('secret key must be atleast 5 characters');
-    if (!/^[\w+=,.@-]+$/.test(process.argv[3])) return console.log('access key has invalid characters');
-
-    accessKey.value = process.argv[3];
-    if (process.argv[4].length < 8) return console.log('secret key must be atleast 8 characters');
-
-    secretKey.value = process.argv[4];
-
-    fs.writeFileSync(MINIO_CONFIG, JSON.stringify(config), 'utf8');
-    console.log('Credentials updated. Restart minio app for new credentials to take effect.\n');
-} else {
-    usage();
-}
-

start.sh

@@ -4,11 +4,23 @@ set -eu
 
 mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
+[[ ! -f /app/data/env.sh ]] && cp /app/code/env.sh /app/data/env.sh
+source /app/data/env.sh
+
+# https://docs.min.io/minio/baremetal/reference/minio-server/minio-server.html#envvar.MINIO_SERVER_URL
+export MINIO_SERVER_URL="https://${API_SERVER_DOMAIN}"
+export MINIO_BROWSER_REDIRECT_URL="https://${CLOUDRON_APP_DOMAIN}"
+
+if [[ ! -d /app/data/mc_config ]]; then
+    mkdir -p /app/data/mc_config
+    /app/code/mc --config-dir /app/data/mc_config &> /dev/null || true
+fi
+
+# minio is used for backups at times and has a large number of files. optimize by checking if files are actually in correct chown state
 echo "==> Changing ownership"
-chown -R cloudron:cloudron /app/data
+[[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data
 
 # the --config-dir is deprecated and not used. but without it, minio will try to create $HOME/.minio :/ same for --certs-dir
 echo "==> Starting minio"
-exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --certs-dir /run/minio/certs --config-dir /run/minio/config --quiet server --address :8000 /app/data/data
-
+exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --certs-dir /run/minio/certs --config-dir /run/minio/config --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :9000 --console-address :8000
 

test/package.json

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

test/test.js

@@ -1,229 +1,182 @@
 #!/usr/bin/env node
 
+/* jshint esversion: 8 */
+/* global describe */
+/* global before */
+/* global after */
+/* global it */
+/* global xit */
+
 'use strict';
 
 require('chromedriver');
 
-var execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
+    fs = require('fs'),
     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;
-
-var bucket = 'cloudrontestbucket';
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+    superagent = require('superagent'),
+    timers = require('timers/promises'),
+    { Builder, By, 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();
+    const LOCATION = 'test';
+    const TEST_TIMEOUT = 30000;
+    const BUCKET = 'cloudrontestbucket';
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    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();
+    let browser, app;
 
-        done();
+    before(function () {
+        browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
-    var TEST_TIMEOUT = 10000;
-    var app;
-
-    function pageLoaded() {
-        return browser.wait(until.elementLocated(by.className('page-load pl-0 pl-1')), TEST_TIMEOUT);
+    async function waitForElement(elem) {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
+        await 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);
-        });
-    }
-
-    function login(accessKey, secretKey, callback) {
-        browser.manage().deleteAllCookies();
-        browser.get('https://' + app.fqdn).then(function () {
-            return visible(by.id('accessKey'));
-        }).then(function () {
-            return browser.findElement(by.id('accessKey')).sendKeys(accessKey);
-        }).then(function () {
-            return browser.findElement(by.id('secretKey')).sendKeys(secretKey);
-        }).then(function () {
-            // return browser.findElement(by.className('lw-btn')).click();
-            return browser.findElement(by.tagName('form')).submit();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('top-right-menu')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function logout(callback) {
-        browser.get('https://' + app.fqdn);
-
-        pageLoaded().then(function () {
-            return visible(by.id('top-right-menu'));
-        }).then(function () {
-            return browser.findElement(by.id('top-right-menu')).click();
-        }).then(function () {
-            return visible(by.xpath('//*[text()="Sign Out "]'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//*[text()="Sign Out "]')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('accessKey')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function addBucket(callback) {
-        browser.get('https://' + app.fqdn);
-
-        pageLoaded().then(function () {
-            return visible(by.className('fa-plus'));
-        }).then(function () {
-            return browser.findElement(by.className('fa-plus')).click();
-        }).then(function () {
-            const c = 'fa-hdd';
-            return visible(by.className(c));
-        }).then(function () {
-            const c = 'fa-hdd';
-            return browser.findElement(by.className(c)).click();
-        }).then(function () {
-            return visible(by.xpath('//*[@class="modal-body"]/form/div/input'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//*[@class="modal-body"]/form/div/input')).sendKeys(bucket);
-        }).then(function () {
-            return browser.findElement(by.xpath('//*[@class="modal-body"]/form')).submit();
-        }).then(function () {
-            return visible(by.xpath('//*[@class="main"]/a[text()="' + bucket + '"]'));
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function checkBucket(callback) {
-        browser.get('https://' + app.fqdn);
-
-        pageLoaded().then(function () {
-            return browser.findElement(by.xpath(`//a[contains(text(), ${bucket})]`));
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function openSettings(callback) {
-        browser.get('https://' + app.fqdn);
-
-        pageLoaded().then(function () {
-            return visible(by.id('top-right-menu'));
-        }).then(function () {
-            return browser.findElement(by.id('top-right-menu')).click();
-        }).then(function () {
-            return visible(by.xpath('//*[contains(text(), "Change Password")]'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//*[contains(text(),"Change Password")]')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//*[contains(text(), "Change Password")]')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
-    }
-
-    xit('build app', function () {
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('install app', function () {
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('can get app information', function () {
+    function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
-
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
-
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
         expect(app).to.be.an('object');
+    }
+
+    async function login(accessKey='minioadmin', secretKey='minioadmin') {
+        await browser.get(`https://${app.fqdn}/login`);
+        await waitForElement(By.id('accessKey'));
+        await browser.findElement(By.id('accessKey')).sendKeys(accessKey);
+        await browser.findElement(By.id('secretKey')).sendKeys(secretKey);
+        await browser.findElement(By.xpath('//button[@id="do-login"]')).click();
+        await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
+        await timers.setTimeout(5000);
+    }
+
+    async function logout() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
+        const button = await browser.findElement(By.xpath('//button[@id="sign-out"]'));
+        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
+        await button.click();
+        await waitForElement(By.id('accessKey'));
+    }
+
+    async function addBucket() {
+        await browser.get(`https://${app.fqdn}/buckets`);
+        await waitForElement(By.xpath('//button[@id="create-bucket"]'));
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
+        await browser.sleep(2000);
+        await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
+        await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
+        await timers.setTimeout(5000);
+    }
+
+    async function checkBucket() {
+        await browser.get(`https://${app.fqdn}/buckets`);
+        await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
+    }
+
+    async function checkRedirect() {
+        const response = await superagent.get(`https://${app.secondaryDomains[0].fqdn}`).set('User-Agent', 'Mozilla/5.0').redirects(0).ok(() => true);
+        expect(response.status).to.be(307);
+        expect(response.headers.location).to.be(`https://${app.fqdn}`);
+    }
+
+    async function checkApi() {
+        const response = await superagent.get(`https://${app.secondaryDomains[0].fqdn}`).ok(() => true);
+        expect(response.status).to.be(403);
+        expect(response.body.toString('utf8')).to.contain('<Code>AccessDenied</Code>');
+    }
+
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
+    it('install app', async function () {
+        execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
 
+    it('can get app information', getAppInfo);
+
     it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('can add bucket', addBucket);
-    it('can open settings', openSettings);
     it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
 
-    it('can change credentials', function () {
-    execSync('cloudron exec --app ' + app.id + ' -- /app/code/minio-credentials set minioakey minioskey', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    it('can change credentials', async function () {
+        let data = fs.readFileSync(path.join(__dirname, '../env.sh'), 'utf8');
+        data = data
+            .replace(/MINIO_ROOT_USER=.*/, 'MINIO_ROOT_USER=minioakey')
+            .replace(/MINIO_ROOT_PASSWORD=.*/, 'MINIO_ROOT_PASSWORD=minioskey');
+        fs.writeFileSync('/tmp/env.sh', data);
+        execSync(`cloudron push --app ${app.id} /tmp/env.sh /app/data/env.sh`, EXEC_ARGS);
+        execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
 
-    it('can restart app', function (done) {
-        execSync('cloudron restart');
-        done();
+    it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
+
+    it('can login', login.bind(null, 'minioakey', 'minioskey'));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
+
+    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+    it('restore app', async function () {
+        const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
+        getAppInfo();
+        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
 
     it('can login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
 
-    it('backup app', function () {
-        execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('restore app', function () {
-        execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('can login', login.bind(null, 'minioakey', 'minioskey'));
-    it('has bucket', checkBucket);
-    it('can open settings', openSettings);
-    it('can logout', logout);
-
-    it('move to different location', function () {
+    it('move to different location', async function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --location ' + LOCATION + '2', { 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');
+        execSync('cloudron configure --location ' + LOCATION + '2', EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
+    it('can get app information', getAppInfo);
 
     it('can login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
 
-    it('uninstall app', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 
     // test update
-    it('can install app', function () {
-        execSync('cloudron install --appstore-id io.minio.cloudronapp --location ' + LOCATION, { 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 install app', function () { execSync('cloudron install --appstore-id io.minio.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
+    it('can get app information', getAppInfo);
 
     it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('can add buckets', addBucket);
     it('can logout', logout);
-    it('can update', function () {
-        execSync('cloudron update --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('can update', function () { execSync(`cloudron update --app ${LOCATION}`, EXEC_ARGS); });
+    it('can configure', function () { execSync(`cloudron configure --app ${LOCATION} --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS); });
+    it('can get app information', getAppInfo);
+
     it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('has bucket', checkBucket);
     it('can logout', logout);
-    it('uninstall app', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
+
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 });