Update minio to RELEASE.2020-04-10T03-34-42Z

minio now stores the config as part of the storage system under .minio.sys
when passed config dir, it merely "migrates" config.json to the new system
and renames config.json to config.json.deprecated

CHANGELOG

@@ -336,3 +336,111 @@
 [1.65.0]
 * Update minio to 2019-06-11T00-44-33Z
 
+[1.66.0]
+* Update minio to 2019-06-15T23-07-18Z
+
+[1.67.0]
+* Update minio to 2019-06-19T18-24-42Z
+
+[1.68.0]
+* Update minio to 2019-06-27T21-13-50Z
+
+[1.69.0]
+* Update minio to 2019-07-05T21-20-21Z
+
+[1.70.0]
+* Update minio to 2019-07-10T00-34-56Z
+
+[1.71.0]
+* Update minio to 2019-07-17T22-54-12Z
+
+[1.72.0]
+* Update minio to 2019-07-24T02-02-23Z
+
+[1.73.0]
+* Update minio to 2019-08-01T22-18-54Z
+
+[1.74.0]
+* Update minio to 2019-08-07T01-59-21Z
+
+[1.75.0]
+* Update minio to 2019-08-14T20-37-41Z
+
+[1.76.0]
+* Update minio to 2019-08-21T19-40-07Z
+
+[1.77.0]
+* Update minio to 2019-08-29T00-25-01Z
+
+[1.78.0]
+* Update minio to 2019-09-05T23-24-38Z
+
+[1.79.0]
+* Update minio to 2019-09-11T19-53-16Z
+
+[1.80.0]
+* Update minio to 2019-09-18T21-55-05Z
+
+[1.81.0]
+* Update minio to 2019-09-25T18-25-51Z
+
+[1.82.0]
+* Update minio to 2019-09-26T19-42-35Z
+
+[1.83.0]
+* Update minio to 2019-10-02T21-19-38Z
+
+[1.84.0]
+* Update minio to 2019-10-11T00-38-09Z
+
+[1.85.0]
+* Update minio to 2019-10-12T01-39-57Z
+
+[1.86.0]
+* Update minio to 2019-12-19T22-52-26Z
+
+[1.87.0]
+* Update minio to 2019-12-30T05-45-39Z
+
+[1.88.0]
+* Update minio to 2020-01-03T19-12-21Z
+
+[1.89.0]
+* Update minio to 2020-01-16T03-05-44Z
+
+[1.90.0]
+* Update minio to 2020-01-16T22-40-29Z
+
+[1.91.0]
+* Update minio to 2020-01-25T02-50-51Z
+
+[1.92.0]
+* Update minio to 2020-02-07T23-28-16Z
+
+[1.93.0]
+* Update minio to 2020-02-20T22-51-23Z
+
+[1.94.0]
+* Update minio to 2020-02-27T00-23-05Z
+
+[1.95.0]
+* Update minio to 2020-03-06T22-23-56Z
+
+[1.96.0]
+* Update minio to 2020-03-09T18-26-53Z
+
+[1.97.0]
+* Update minio to 2020-03-14T02-21-58Z
+
+[1.98.0]
+* Update minio to 2020-03-19T21-49-00Z
+
+[1.99.0]
+* Update minio to 2020-03-25T07-03-04Z
+
+[1.100.0]
+* Update minio to 2020-04-02T21-34-49Z
+
+[1.101.0]
+* Update minio to 2020-04-04T05-39-31Z
+

CloudronManifest.json

@@ -5,15 +5,15 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "1.65.0",
+  "version": "1.101.0",
   "healthCheckPath": "/minio/login",
   "httpPort": 8000,
   "addons": {
     "localstorage": {}
   },
-  "manifestVersion": 1,
+  "manifestVersion": 2,
   "website": "http://www.minio.io",
-  "minBoxVersion": "1.8.1",
+  "minBoxVersion": "4.1.4",
   "documentationUrl": "https://cloudron.io/documentation/apps/minio/",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Minio <upstream>2019-06-11T00-44-33Z</upstream>.
+This app packages Minio <upstream>2020-04-04T05-39-31Z</upstream>.
 
 Minio is a distributed object storage server built for cloud applications and devops.
 

Dockerfile

@@ -1,12 +1,14 @@
 FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
 
+ARG VERSION=RELEASE.2020-04-10T03-34-42Z
+
 RUN mkdir -p /app/code \
-    && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2019-06-11T00-44-33Z -O /app/code/minio \
+    && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio \
     && chmod +x /app/code/minio
 
 WORKDIR /app/code
 
-ADD config.json /app/code/config.json
 ADD start.sh /app/code/start.sh
+ADD minio-credentials /app/code/minio-credentials
 
 CMD [ "/app/code/start.sh" ]

POSTINSTALL.md

@@ -2,7 +2,7 @@ This application does not integrate with Cloudron authentication.
 
 Please use the following credentials to login:
 
-* AccessKey: `admin`
-* SecretKey: `secretkey`
+* AccessKey: `minioadmin`
+* SecretKey: `minioadmin`
 
-**Please change the credentials immediately**
+**Please change the credentials immediately following the docs**

config.json

@@ -1,14 +0,0 @@
-{
-        "version": "33",
-        "credential": {
-                "accessKey": "admin",
-                "secretKey": "secretkey"
-        },
-        "region": "us-east-1",
-        "logger": {
-                "console": {
-                        "enable": true,
-                        "level": "error"
-                }
-        }
-}

minio-credentials

@@ -0,0 +1,41 @@
+#!/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

@@ -2,16 +2,13 @@
 
 set -eu
 
-mkdir -p /app/data/data /app/data/certs /app/data/config
+mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
-if ! [ -f /app/data/config/config.json ]; then
-  cp /app/code/config.json /app/data/config/config.json
-fi
-
-echo "Changing ownership"
+echo "==> Changing ownership"
 chown -R cloudron:cloudron /app/data
 
-echo "Starting minio"
-exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio server --config-dir /app/data/config --certs-dir /app/data/certs --address :8000 /app/data/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
 
 

test/package.json

@@ -9,14 +9,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^74.0.0",
-    "ejs": "^2.6.1",
+    "chromedriver": "^79.0.0",
+    "ejs": "^3.0.1",
     "expect.js": "^0.3.1",
     "mkdirp": "^0.5.1",
-    "mocha": "^6.1.4",
-    "rimraf": "^2.6.3",
-    "selenium-server-standalone-jar": "^3.141.5",
+    "mocha": "^7.0.0",
+    "rimraf": "^3.0.0",
+    "selenium-server-standalone-jar": "^3.141.59",
     "selenium-webdriver": "^3.6.0",
-    "superagent": "^5.0.5"
+    "superagent": "^5.2.1"
   }
 }

test/test.js

@@ -14,14 +14,10 @@ var by = require('selenium-webdriver').By,
     Key = require('selenium-webdriver').Key,
     Builder = require('selenium-webdriver').Builder;
 
-var accessKey = 'admin',
-    secretKey = 'secretkey';
-
 var bucket = 'cloudrontestbucket';
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-
 describe('Application life cycle test', function () {
     this.timeout(0);
 
@@ -56,7 +52,7 @@ describe('Application life cycle test', function () {
         });
     }
 
-    function login(callback) {
+    function login(accessKey, secretKey, callback) {
         browser.manage().deleteAllCookies();
         browser.get('https://' + app.fqdn).then(function () {
             return visible(by.id('accessKey'));
@@ -96,13 +92,15 @@ describe('Application life cycle test', function () {
         browser.get('https://' + app.fqdn);
 
         pageLoaded().then(function () {
-            return visible(by.className('fa fa-plus'));
+            return visible(by.className('fa-plus'));
         }).then(function () {
-            return browser.findElement(by.className('fa fa-plus')).click();
+            return browser.findElement(by.className('fa-plus')).click();
         }).then(function () {
-            return visible(by.className('fa fa-hdd-o'));
+            const c = 'fa-hdd';
+            return visible(by.className(c));
         }).then(function () {
-            return browser.findElement(by.className('fa fa-hdd-o')).click();
+            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 () {
@@ -149,7 +147,7 @@ describe('Application life cycle test', function () {
     });
 
     it('install app', function () {
-        execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can get app information', function () {
@@ -160,17 +158,21 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('can add bucket', addBucket);
     it('can open settings', openSettings);
     it('can logout', logout);
 
+    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 restart app', function (done) {
-        execSync('cloudron restart --wait');
+        execSync('cloudron restart');
         done();
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
 
@@ -182,20 +184,20 @@ describe('Application life cycle test', function () {
         execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
-    it('can login', login);
+    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 () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        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');
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
 
@@ -205,19 +207,19 @@ describe('Application life cycle test', function () {
 
     // test update
     it('can install app', function () {
-        execSync('cloudron install --new --wait --appstore-id io.minio.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        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 login', login);
+    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('can add buckets', addBucket);
     it('can logout', logout);
     it('can update', function () {
-        execSync('cloudron install --wait --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron update --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
-    it('can login', login);
+    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
     it('has bucket', checkBucket);
     it('can logout', logout);
     it('uninstall app', function () {