Update test deps

this allows subdomain style bucket access

CHANGELOG

@@ -968,3 +968,297 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * 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.
+
+[2.1.0]
+* Update minio to 2022-01-28T02-28-16Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-01-28T02-28-16Z)
+* make sure to pass groups for all credentials while verifying policies by @harshavardhana in #14193
+* do not expect 'speedtest' to be a bucket by @harshavardhana in #14199
+* Optimize read locker cleanup by @klauspost in #14200
+* Ensure that AssumeRole calls are sent to Audit log by @donatello in #14202
+
+[2.2.0]
+* Update minio to 2022-02-05T04-40-59Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-02-05T04-40-59Z)
+
+[2.2.1]
+* Update minio to 2022-02-07T08-17-33Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-02-07T08-17-33Z)
+
+[2.3.0]
+* Update minio to 2022-02-18T01-50-10Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-02-18T01-50-10Z)
+
+[2.3.1]
+* Update minio to 2022-02-24T22-12-01Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-02-24T22-12-01Z)
+
+[2.3.2]
+* Update minio to 2022-02-26T02-54-46Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-02-26T02-54-46Z)
+
+[2.3.3]
+* Update minio to 2022-03-05T06-32-39Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-05T06-32-39Z)
+
+[2.3.4]
+* Update minio to 2022-03-08T22-28-51Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-08T22-28-51Z)
+
+[2.4.0]
+* Update minio to 2022-03-11T11-08-23Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-11T11-08-23Z)
+
+[2.4.1]
+* Update minio to 2022-03-11T23-57-45Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-11T23-57-45Z)
+* add filesystem group change policy for large minio deployments by @dharapvj in #14528
+* Fix regression from range GET proxying #14345 by @poornas in #14532
+
+[2.4.2]
+* Update minio to 2022-03-14T18-25-24Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-14T18-25-24Z)
+
+[2.4.3]
+* Update minio to 2022-03-17T06-34-49Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-17T06-34-49Z)
+
+[2.4.4]
+* Update minio to 2022-03-22T02-05-10Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-22T02-05-10Z)
+
+[2.4.5]
+* Update minio to 2022-03-24T00-43-44Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-24T00-43-44Z)
+
+[2.4.6]
+* Update minio to 2022-03-26T06-49-28Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-03-26T06-49-28Z)
+
+[2.4.7]
+* Update minio to 2022-04-01T03-41-39Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-01T03-41-39Z)
+* Always get the actual object size in bulk SSE-S3 by @vadmeste in #14637
+* listing: decrypt only SSE-S3 single-part ETags by @aead in #14638
+* Load IAM with a single listing call by @donatello in #14640
+* fix: multiple pool setup return incorrect DeleteMarker metadata by @harshavardhana in #14642
+* Quick type for fix ttfb entry in table by @eco-minio in #14647
+
+[2.4.8]
+* Update minio to 2022-04-09T15-09-52Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-09T15-09-52Z)
+* Add metrics for observing IAM sync operations by @donatello in #14680
+* Write deployment id to health report at the start by @anjalshireesh in #14673
+* etag: add Format and Decrypt functions by @aead in #14659
+* Remove unnecessary log printing by @vadmeste in #14685
+* listing: improve listing of encrypted objects by @aead in #14667
+* Set inspect-input.txt modtime by @klauspost in #14688
+
+[2.4.9]
+* Update minio to 2022-04-12T06-55-35Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-12T06-55-35Z)
+* Fix a privilege escalation security issue - https://github.com/minio/minio/security/advisories/GHSA-2j69-jjmg-534q
+* Console v0.15.10 by @dvaldivia in #14723
+* align atomic variables once more for 32bit by @harshavardhana in #14721
+* make sure to pass Lifecycle if set for List filtering by @harshavardhana in #14722
+* Set permissions for GitHub actions by @naveensrinivasan in #14693
+* Add support for minio tier type by @krisis in #14468
+
+[2.4.10]
+* Update minio to 2022-04-16T04-26-02Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-16T04-26-02Z)
+* Allow parallel decom migration threads to be more than erasure sets by @krishnasrinivas in #14733
+* Include speedtest as part of healthinfo api by @anjalshireesh in #14696
+* Support templating accessKey existingSecret and bucket name by @yisiqi in #14643
+* enable go1.18.x builds by @harshavardhana in #14746
+* [S3Select] Switch to new parquet library and reduce locking by @donatello in #14731
+* Update Console v0.15.13 by @dvaldivia in #14751
+
+[2.4.11]
+* Update minio to 2022-04-26T01-20-24Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-26T01-20-24Z)
+
+[2.4.12]
+* Update minio to 2022-04-29T01-27-09Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-04-29T01-27-09Z)
+
+[2.4.13]
+* Update minio to 2022-05-03T20-36-08Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-03T20-36-08Z)
+* fix: panic in browser redirect handler for unexpected r.Host by @harshavardhana in #14844
+* fix: reject invalid r.Host headers by @harshavardhana in #14846
+* fix: disallow newer policies, users & groups with space characters by @harshavardhana in #14845
+* Check error status codes by @klauspost in #14850
+* Log Range Header by @klauspost in #14851
+* fix: remove embedded-policy as requested by the user by @harshavardhana in #14847
+
+[2.4.14]
+* Update minio to 2022-05-04T07-45-27Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-04T07-45-27Z)
+* Add audit log for decommissioning
+
+[2.5.0]
+* Update minio to 2022-05-08T23-50-31Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-08T23-50-31Z)
+* Fix missing annotations for PVCs by @Sea-you in #14793
+* Add OPA doc and remove deprecation marking by @donatello in #14863
+* avoid concurrent reads and writes to opts.UserDefined by @harshavardhana in #14862
+
+[2.5.1]
+* Update minio to 2022-05-19T18-20-59Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-19T18-20-59Z)
+* pools: GetObjectNInfo should cover locking during object read by @vadmeste in #14887
+* tracing: Add disk path to storage tracing by @vadmeste in #14883
+* Add support for Access Management Plugin by @donatello in #14875
+* If decom of an object fails, retry for 3 times by @krishnasrinivas in #14861
+* update new name for MINIO_POLICY_OPA_URL by @itsericqiu in #14898
+* add support for extra Prometheus labels by @harshavardhana in #14899
+* use BadRequest HTTP status instead of Conflict for certain errors by @harshavardhana in #14900
+
+[2.5.2]
+* Update minio to 2022-05-23T18-45-11Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-23T18-45-11Z)
+* mrf: Fix stale MRF data showed in heal info by @vadmeste in #14953
+* Relax site replication syncing of service accounts by @poornas in #14955
+* Fix WalkDir fallback hot loop by @klauspost in #14961
+* fetch bucket replication stats across peers in single call by @harshavardhana in #14956
+
+[2.5.3]
+* Update minio to 2022-05-26T05-48-41Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-26T05-48-41Z)
+* replication healing: Fix typo when healing bucket quota info by @vadmeste in #14966
+* Do not use inline data size in xl.meta quorum calculation by @vadmeste in #14831
+* hash-set: Add file input for debug tool by @klauspost in #14965
+* site replication: Allow replication rule edit by @poornas in #14969
+* fix: copyObject on versioned bucket when updating metadata by @harshavardhana in #14971
+
+[2.6.0]
+* Update minio to 2022-06-02T02-11-04Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-02T02-11-04Z)
+* feat: Single drive XL implementation
+
+[2.7.0]
+* Update minio to 2022-06-07T00-33-41Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-07T00-33-41Z)
+
+[2.7.1]
+* Update minio to 2022-06-07T00-33-41Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-07T00-33-41Z)
+* do not print errors upon 'nil' err (06/06/22) (Minio Trusted)
+
+[2.7.2]
+* Update minio to 2022-06-10T16-59-15Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-10T16-59-15Z)
+* Include the entirety of vendor folder in .gitignore by @kaankabalak in #15046
+* relax O_DIRECT in single drive mode if unsupported by @harshavardhana in #15045
+* Bump Console v0.18.1 by @dvaldivia in #15051
+* healthcheck cluster endpoint should honor write/readQuorum per pool by @harshavardhana in #15053
+* fix: make metrics endpoint responsive by reducing the chatter by @harshavardhana in #15055
+
+[2.7.3]
+* Update minio to 2022-06-11T19-55-32Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-11T19-55-32Z)
+* debug: verify diff on latest objects on source and target buckets by @harshavardhana in #15069
+* fix: add missing minio_s3_requests_total by @harshavardhana in #15070
+* Update dperf to 0.4.1 by @vadmeste in #15071
+* sts: Avoid printing all STS errors by @vadmeste in #15065
+
+[2.7.4]
+* Update minio to 2022-06-17T02-00-35Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-17T02-00-35Z)
+* debug: Close object after check by @vadmeste in #15077
+* kms: initialize after cli parsing by @vadmeste in #15076
+* Support configuration of a session policy file by @rgcostea in #15078
+* erasure-sd: Evaluate versioning Prefix in multi-delete objects by @vadmeste in #15081
+* fix: simplify healthcheck code to freeze calls only once by @harshavardhana in #15082
+* add bucket level S3 received/sent bytes by @harshavardhana in #15084
+* fix: background local test also via channel by @harshavardhana in #15086
+* add dataErrs for healing debug log by @harshavardhana in #15092
+
+[2.7.5]
+* Update minio to 2022-06-20T23-13-45Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-20T23-13-45Z)
+* Update gopsutil to v3.22.5 by @danieljakots in #15098
+* fix: ignore printing io.EOF during WalkDir() on concurrently modified objects by @harshavardhana in #15100
+* Avoid CompleteMultipart freeze with unexpected network issue by @vadmeste in #15102
+* Add generic function to retrieve config value with metadata by @donatello in #15083
+* fix typo in site replication version healing by @poornas in #15103
+* Add import/export APIs to migrate bucket metadata by @poornas in #14929
+
+[2.7.6]
+* Update minio to 2022-06-25T15-50-16Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-25T15-50-16Z)
+* remove gateway banner and some other TODO loggers by @harshavardhana in #15125
+* s3-verify: Fix endpoint and missing comparison by @vadmeste in #15129
+* Parallelize new disks healing of different erasure sets by @vadmeste in #15112
+* fips: simplify TLS configuration by @aead in #15127
+* fix: cant parse comment without '=' in environment file by @anoworl in #15130
+* add go1.18 specific curve preferences by @harshavardhana in #15132
+
+[2.7.7]
+* Update minio to 2022-06-30T20-58-09Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-06-30T20-58-09Z)
+* Supports parity configuration of '0', '1' enabling support for 2,3 drive setups for erasure coding.
+* add license banner for GNU AGPLv3 by @harshavardhana in #15178
+* save MinIO version with each version (8-bytes extra) by @harshavardhana in #15170
+* Remove unnecessary code in WalkDir() by @vadmeste in #15168
+* perform object sweep after equeue the latest CopyObject() by @harshavardhana in #15183
+* Upgrade reedsolomon/compression packages by @klauspost in #15182
+* Revert proxying requests with precondition errors by @vadmeste in #15180
+* allow support for parity '0', '1' enabling support for 2,3 drive setups by @harshavardhana in #15171
+* handle missing funcNames for handlers by @harshavardhana in #15188
+* update banner to reflect the final agreed UI by @harshavardhana in #15192
+* site healing: Skip stale bucket metadata updates from peer by @poornas in #15186
+* de-couple caller context to avoid internal races by @harshavardhana in #15195
+* Save minio version in xl.meta while healing in outdated disks by @vadmeste in #15181
+* finalize startup-banner and remove unnecessary logs by @harshavardhana in #15202
+* Make ReqInfo concurrency safe by @klauspost in #15204
+* update banner with version+runtime by @harshavardhana in #15206

CloudronManifest.json

@@ -5,23 +5,34 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "1.163.0",
+  "version": "2.7.7",
+  "upstreamVersion": "2022-06-30T20-58-09Z",
   "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": "5.3.0",
+  "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", "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"
   ],
+  "multiDomain": true,
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,29 +1,29 @@
-This app packages Minio <upstream>2021-05-11T23-27-41Z</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:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
-
-ARG VERSION=RELEASE.2021-05-11T23-27-41Z
-
-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-06-30T20-58-09Z
+ARG MC_VERSION=RELEASE.2022-06-26T18-51-48Z
+
+# 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
+# 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
+
+COPY env.sh 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
+

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,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,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^89.0.0",
+    "chromedriver": "^103.0.0",
+    "delay": "^5.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^8.3.2",
-    "selenium-webdriver": "^3.6.0"
+    "mocha": "^10.0.0",
+    "selenium-webdriver": "^4.3.0",
+    "superagent": "^8.0.0"
   }
 }

test/test.js

@@ -1,31 +1,34 @@
 #!/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 delay = require('delay'),
+    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 TEST_TIMEOUT = 30000;
     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 +38,85 @@ 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('//span[contains(text(), "Buckets")]'));
+        await delay(5000);
     }
 
-    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 logout() {
+        await browser.get(`https://${app.fqdn}/`);
+        await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
+        await browser.findElement(By.xpath('//div/span[contains(text(), "Logout")]')).click();
+        await waitForElement(By.id('accessKey'));
     }
 
-    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 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 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 delay(5000);
     }
 
-    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 checkBucket() {
+        await browser.get(`https://${app.fqdn}/buckets`);
+        await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
     }
 
-    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 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}`);
     }
 
-    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();
-        });
+    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', async function () {
+        execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
+        await delay(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`, EXEC_ARGS);
+    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 delay(10000);
     });
 
     it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
@@ -168,30 +124,37 @@ 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 () {
+    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 delay(10000);
     });
 
     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 () {
+    it('move to different location', async function () {
         browser.manage().deleteAllCookies();
         execSync('cloudron configure --location ' + LOCATION + '2', EXEC_ARGS);
+        await delay(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, EXEC_ARGS); });
 
@@ -202,12 +165,15 @@ describe('Application life cycle test', function () {
     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 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); });
 });