Update screenshots

We can now use MINIO_ROOT_USER  and MINIO_ROOT_PASSWORD env vars.
These default to minioadmin. When set, it will change/update the password.
When not set, it keeps the old password from the last run.

CHANGELOG

@@ -963,3 +963,57 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * fix: newMultipartUpload should go to same pool as existing object. See (#12106) for more details.
 * ignore more tokens in some mountinfo entries. See (#12104) for more details.
 * Grab read lock while reading usage cache. See (#12111) for more details.
+
+[1.163.0]
+* Update minio to 2021-05-11T23-27-41Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-05-11T23-27-41Z)
+
+[1.164.0]
+* Update minio to 2021-05-18T00-53-28Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-05-18T00-53-28Z)
+
+[1.164.1]
+* Update minio to 2021-05-20T22-31-44Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-05-20T22-31-44Z)
+
+[1.164.2]
+* Update minio to 2021-05-22T02-34-39Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-05-22T02-34-39Z)
+
+[1.164.3]
+* Update minio to 2021-05-27T22-06-31Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-05-27T22-06-31Z)
+
+[1.164.4]
+* Update minio to 2021-06-07T21-40-51Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-06-07T21-40-51Z)
+
+[1.164.5]
+* Update minio to 2021-06-14T01-29-23Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-06-14T01-29-23Z)
+
+[1.165.0]
+* Update minio to 2021-06-17T00-10-46Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-06-17T00-10-46Z)
+
+[1.165.1]
+* Update minio to 2021-07-08T01-15-01Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-07-08T01-15-01Z)
+
+[1.166.0]
+* Update minio to 2021-07-22T05-23-32Z
+* Use new minio dashboard 2021-06-13T17-48-22Z
+
+[1.167.0]
+* Update minio to 2021-09-15T04-54-25Z
+* Update minio dashboard to 2021-09-02T09-21-27Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2021-09-15T04-54-25Z)
+* SSE-KMS support was not working with copyObject() refer #13206
+* Support UserInfo claims refer #12469
+
+[2.0.0]
+* **This is a major update. The changes below are required for the app to work. The newer version of the app has 2 domain names - one for the console (browser UI) and one of the API domain (API/S3 requests). **
+  * Be sure to take a backup before updating the app.
+  * Once updated, go to the `Location` view and set the API Domain.
+  * Update the various apps/servers/code to use the API domain as the backup destination.
+

CloudronManifest.json

@@ -5,23 +5,31 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "1.162.0",
+  "version": "2.0.0",
   "healthCheckPath": "/minio/login",
   "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": "5.3.0",
+  "minBoxVersion": "7.1.0",
   "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", "s3", "objectstore" ],
   "mediaLinks": [
-    "https://screenshots.cloudron.io/io.minio.cloudronapp/minio-browser-gateway.png",
-    "https://screenshots.cloudron.io/io.minio.cloudronapp/minio-browser.png"
+    "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,4 +1,4 @@
-This app packages Minio <upstream>2021-04-22T15-44-28Z</upstream>.
+This app packages Minio <upstream>2021-09-15T04-54-25Z</upstream>.
 
 Minio is a distributed object storage server built for cloud applications and devops.
 

Dockerfile

@@ -1,14 +1,14 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
-
-ARG VERSION=RELEASE.2021-04-22T15-44-28Z
-
-RUN mkdir -p /app/code \
-    && wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio \
-    && chmod +x /app/code/minio
+FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
+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.2022-01-08T03-11-54Z
+ARG MC_VERSION=RELEASE.2022-01-07T06-01-38Z
+
+RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio && \
+    wget https://dl.min.io/client/mc/release/linux-amd64/mc.${MC_VERSION} -O /app/code/mc && chmod +x /app/code/mc
+
+COPY env.sh minio-credentials start.sh /app/code/
 
 CMD [ "/app/code/start.sh" ]

README.md

@@ -34,3 +34,6 @@ 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

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
+

start.sh

@@ -4,16 +4,23 @@ set -eu
 
 mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
-# 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
+[[ ! -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
+[[ -n "${API_SERVER_DOMAIN:-}" ]] && 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"
 [[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data
 
-[[ ! -f /app/data/env.sh ]] && echo -e "# Add custom minio configuration to this file. Restart the app for changes to take effect.\n\nexport CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'" > /app/data/env.sh
-
-source /app/data/env.sh
-
 # 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 ${CLOUDRON_MINIO_STARTUP_ARGS} --address :8000 
+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,9 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^89.0.0",
+    "chromedriver": "^97.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^8.3.2",
-    "selenium-webdriver": "^3.6.0"
+    "mocha": "^9.1.4",
+    "selenium-webdriver": "^4.1.1",
+    "superagent": "^7.1.1"
   }
 }

test/test.js

@@ -1,31 +1,33 @@
 #!/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'),
-    { Builder, By, Key, until } = require('selenium-webdriver'),
+    superagent = require('superagent'),
+    { Builder, By, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
 
-
 describe('Application life cycle test', function () {
     this.timeout(0);
 
     const LOCATION = 'test';
     const TEST_TIMEOUT = 10000;
-    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
     const BUCKET = 'cloudrontestbucket';
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    var app;
-    var browser;
+    let browser, app;
 
     before(function () {
         browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
@@ -35,132 +37,108 @@ describe('Application life cycle test', function () {
         browser.quit();
     });
 
+    async function waitForElement(elem) {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
+    }
+
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
         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.elementLocated(By.className('page-load pl-0 pl-1')), TEST_TIMEOUT);
+    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[contains(text(), "Login")]')).click();
+        await waitForElement(By.xpath('//h4[contains(text(), "Dashboard")]'));
     }
 
-    function visible(selector) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
-        });
+    async function old_login(accessKey='minioadmin', secretKey='minioadmin') {
+        await browser.get(`https://${app.fqdn}/minio/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[@type="submit"]')).click();
+        await waitForElement(By.xpath('//input[@placeholder="Search Buckets..."]'));
     }
 
-    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();
-        });
+    async function logout() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//div/span[contains(text(), "Dashboard")]'));
+        await browser.findElement(By.xpath('//div/span[contains(text(), "Logout")]')).click();
+        await waitForElement(By.id('accessKey'));
     }
 
-    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 () {
-            if (app.manifest.version === '1.137.0') {
-                return visible(By.xpath('//*[text()="Sign Out "]'));
-            } else {
-                return visible(By.xpath('//*[contains(text(), "Logout")]'));
-            }
-        }).then(function () {
-            if (app.manifest.version === '1.137.0') {
-                return browser.findElement(By.xpath('//*[text()="Sign Out "]')).click();
-            } else {
-                return browser.findElement(By.xpath('//*[contains(text(),"Logout")]')).click();
-            }
-        }).then(function () {
-            return browser.wait(until.elementLocated(By.id('accessKey')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
+    async function old_logout() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//input[@placeholder="Search Buckets..."]'));
+        await browser.findElement(By.xpath('//div/button[@id="top-right-menu"]')).click();
+        await browser.findElement(By.xpath('//ul/li/a[@id="logout"]')).click();
+        await waitForElement(By.id('accessKey'));
     }
 
-    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();
-        });
+    async function addBucket() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//div/span[contains(text(), "Bucket")]'));
+        await browser.findElement(By.xpath('//div/span[contains(text(), "Bucket")]')).click();
+        await waitForElement(By.xpath('//button[text()="Create Bucket"]'));
+        await browser.findElement(By.xpath('//button[text()="Create Bucket"]')).click();
+        await browser.sleep(2000);
+        await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
+        await browser.findElement(By.xpath('//button[text()="Create Bucket"]')).click();
+        await waitForElement(By.xpath(`//a[contains(text(), "${BUCKET}")]`));
     }
 
-    function checkBucket(callback) {
-        browser.get('https://' + app.fqdn);
-
-        pageLoaded().then(function () {
-            return browser.findElement(By.xpath(`//a[contains(text(), ${BUCKET})]`));
-        }).then(function () {
-            callback();
-        });
+    async function old_addBucket() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//input[@placeholder="Search Buckets..."]'));
+        await browser.findElement(By.xpath('//div/button[@id="fe-action-toggle"]')).click();
+        await browser.findElement(By.xpath('//ul/a[@id="show-make-bucket"]')).click();
+        await browser.findElement(By.xpath('//input[@placeholder="Bucket Name"]')).sendKeys(BUCKET);
+        await browser.findElement(By.xpath('//*[@class="modal-body"]/form')).submit();
+        await waitForElement(By.xpath(`//*[@class="main"]/a[text()="${BUCKET}"]`));
     }
 
-    function openSettings(callback) {
-        browser.get('https://' + app.fqdn);
+    async function checkBucket() {
+        await browser.get(`https://${app.fqdn}/buckets`);
+        await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
+    }
 
-        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();
-        });
+    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', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
+    it('install app', function () { execSync(`cloudron install --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('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`, EXEC_ARGS);
+        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);
     });
 
     it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
@@ -168,6 +146,8 @@ describe('Application life cycle test', function () {
     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', function () {
@@ -180,8 +160,9 @@ describe('Application life cycle test', function () {
 
     it('can login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
-    it('can open settings', openSettings);
     it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
@@ -192,6 +173,8 @@ describe('Application life cycle test', function () {
     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, EXEC_ARGS); });
 
@@ -199,15 +182,18 @@ describe('Application life cycle test', function () {
     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, EXEC_ARGS); });
+    it('can login', old_login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can add buckets', old_addBucket);
+    it('can logout', old_logout);
+    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('does redirect', checkRedirect);
+    it('check api', checkApi);
 
     it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 });