Version 3.12.6

this allows subdomain style bucket access

CloudronManifest.json

@@ -5,9 +5,10 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "2.4.7",
-  "upstreamVersion": "2022-04-01T03-41-39Z",
+  "version": "3.12.6",
+  "upstreamVersion": "2024-01-29T03-56-32Z",
   "healthCheckPath": "/minio/login",
+  "memoryLimit": 805306368,
   "httpPort": 8000,
   "httpPorts": {
     "API_SERVER_DOMAIN": {

Dockerfile

@@ -1,16 +1,16 @@
-FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=RELEASE.2022-04-01T03-41-39Z
-ARG MC_VERSION=RELEASE.2022-04-01T23-44-48Z
+ARG VERSION=RELEASE.2024-01-29T03-56-32Z
 
 # 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/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.${MC_VERSION} -O /app/code/mc && chmod +x /app/code/mc
+RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /app/code/mc && chmod +x /app/code/mc
 
-COPY env.sh minio-credentials start.sh /app/code/
+COPY env.sh start.sh /app/code/
 
 CMD [ "/app/code/start.sh" ]

README.md

@@ -37,3 +37,8 @@ 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.
+

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,12 @@ set -eu
 
 mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
+# env vars take precedence over config.yaml (https://github.com/minio/minio/blob/master/docs/distributed/CONFIG.md#things-to-know)
 [[ ! -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_SERVER_URL="https://${API_SERVER_DOMAIN}"
 export MINIO_BROWSER_REDIRECT_URL="https://${CLOUDRON_APP_DOMAIN}"
 
 if [[ ! -d /app/data/mc_config ]]; then
@@ -20,7 +21,6 @@ fi
 echo "==> Changing ownership"
 [[ $(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 ${CLOUDRON_MINIO_STARTUP_ARGS} --address :9000 --console-address :8000
+exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :9000 --console-address :8000
 

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^100.0.0",
+    "chromedriver": "^121.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^9.2.2",
-    "selenium-webdriver": "^4.1.1",
-    "superagent": "^7.1.1"
+    "mocha": "^10.2.0",
+    "selenium-webdriver": "^4.17.0",
+    "superagent": "^8.1.2"
   }
 }

test/test.js

@@ -16,6 +16,7 @@ const execSync = require('child_process').execSync,
     fs = require('fs'),
     path = require('path'),
     superagent = require('superagent'),
+    timers = require('timers/promises'),
     { Builder, By, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
 
@@ -23,7 +24,7 @@ describe('Application life cycle test', function () {
     this.timeout(0);
 
     const LOCATION = 'test';
-    const TEST_TIMEOUT = 10000;
+    const TEST_TIMEOUT = 30000;
     const BUCKET = 'cloudrontestbucket';
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
@@ -53,25 +54,29 @@ describe('Application life cycle test', function () {
         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(), "Buckets")]'));
+        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('//h4[contains(text(), "Buckets")]'));
-        await browser.findElement(By.xpath('//div/span[contains(text(), "Logout")]')).click();
+        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/span[text()="Create Bucket"]'));
-        await browser.findElement(By.xpath('//button/span[text()="Create Bucket"]')).click();
+        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[text()="Create Bucket"]')).click();
-        await waitForElement(By.xpath(`//a[contains(text(), "${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() {
@@ -92,7 +97,10 @@ describe('Application life cycle test', function () {
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-    it('install app', function () { execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, 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);
 
@@ -102,7 +110,7 @@ describe('Application life cycle test', function () {
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
-    it('can change credentials', function () {
+    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')
@@ -110,6 +118,7 @@ describe('Application life cycle test', function () {
         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 () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
@@ -121,12 +130,13 @@ describe('Application life cycle test', function () {
     it('check api', checkApi);
 
     it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
-    it('restore app', function () {
+    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'));
@@ -135,9 +145,10 @@ describe('Application life cycle test', function () {
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
-    it('move to different location', function () {
+    it('move to different location', async function () {
         browser.manage().deleteAllCookies();
         execSync('cloudron configure --location ' + LOCATION + '2', EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
     it('can get app information', getAppInfo);