Bump test deps

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

@@ -91,7 +91,7 @@
 * Quorum based listing for XL (#5475)
 * fs.json file should be closed in CompleteMultipartUpload (#5482)
 * simplify storage class validation (#5470)
-* Remove stale code from minio server (#5479) 
+* Remove stale code from minio server (#5479)
 
 [1.8.0]
 * Update minio to 2018-03-12T21-25-28Z
@@ -107,7 +107,7 @@
 * Support SSE-C multipart source objects in CopyObject (#5603)
 * Handle incoming proxy requests ip, scheme (#5591)
 * Make sure to filter out internal metadata (#5601)
-* Use toAPIErrorCode in HeadObject handler when decrypting request fails (#5600) 
+* Use toAPIErrorCode in HeadObject handler when decrypting request fails (#5600)
 
 [1.9.0]
 * Update minio to 2018-03-16T22-52-12Z
@@ -144,7 +144,7 @@
 * Remove logging of redundant messages when running Minio server.
 * Upgrading to this release will automatically migrate any erroneous bucket policies to strict S3 compliant bucket policies. Please check all your bucket policies after upgrading to this release.
 * Fix s3 compatibility fixes for getBucketLocation,headBucket,deleteBucket (#5842) (04/23/18)
-* Disable "chunked" uploading by the GCS client for objects smaller than the chunk size. (#5835) (04/20/18) 
+* Disable "chunked" uploading by the GCS client for objects smaller than the chunk size. (#5835) (04/20/18)
 
 [1.15.0]
 * Update minio to 2018-05-04T23-13-12Z
@@ -154,7 +154,7 @@
 * fs: fix logging by not logging common scenarios (#5882) (05/02/18)
 * Return NoSuchKey for anonReqs with s3:ListBucket policy (#5876) (05/01/18)
 * Remove s3:ListObjects policy action to be in sync with AWS-S3 (#5875) (05/01/18)
-* Copy an object without user-defined metadata for Azure gateway (#5872) (05/02/18) 
+* Copy an object without user-defined metadata for Azure gateway (#5872) (05/02/18)
 
 [1.16.0]
 * Update minio to 2018-05-11T00-29-24Z
@@ -172,7 +172,7 @@
 * Update minio to 2018-06-09T03-43-35Z
 
 [1.21.0]
-* Update minio to 2018-06-22T23-48-46Z 
+* Update minio to 2018-06-22T23-48-46Z
 
 [1.22.0]
 * Update minio to 2018-06-29T02-11-29Z
@@ -197,7 +197,7 @@
 * Log x-amz-request-id as log and XML error response (#6173) (07/20/18)
 * Remove ppc64le support from .travis.yml (#6180) (07/20/18)
 * Remove unused functions and constants (#6175) (07/20/18)
-* Do not trace HTTP body of PostPolicyBuckethandler (#6177) (07/20/18) 
+* Do not trace HTTP body of PostPolicyBuckethandler (#6177) (07/20/18)
 
 [1.25.0]
 * Update minio to 2018-07-31T02-11-47Z
@@ -305,7 +305,7 @@
 
 [1.56.0]
 * Update miniot to 2019-04-04T18-31-46Z
-* (security) fix privilege escalation against inter-node communication 
+* (security) fix privilege escalation against inter-node communication
 * (security) Validate if bucket names are internal
 * canonicalize ETag correctly
 
@@ -363,3 +363,175 @@
 [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
+
+[1.102.0]
+* Update minio to 2020-04-10T03-34-42Z
+
+[1.103.0]
+* Update minio to 2020-04-15T00-39-01Z
+
+[1.104.0]
+* Update minio to 2020-04-15T19-42-18Z
+
+[1.105.0]
+* Update minio to 2020-04-23T00-58-49Z
+* Use latest docker image
+
+[1.106.0]
+* Update minio to 2020-04-28T23-56-56Z
+
+[1.107.0]
+* Update minio to 2020-05-01T22-19-14Z
+
+[1.108.0]
+* Update minio to 2020-05-08T02-40-49Z
+
+[1.109.0]
+* Update minio to 2020-05-16T01-33-21Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-05-16T01-33-21Z)
+
+[1.110.0]
+* Update minio to 2020-05-28T23-29-21Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-05-28T23-29-21Z)
+
+[1.111.0]
+* Update minio to 2020-05-29T14-08-49Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-05-29T14-08-49Z)
+
+[1.112.0]
+* Update minio to 2020-06-01T17-28-03Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-06-01T17-28-03Z)
+
+[1.113.0]
+* Update minio to 2020-06-03T22-13-49Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-06-03T22-13-49Z)
+* Implement UploadPart-Copy API for Azure. See (#9747) for more details.
+* Concurrent loading of bucket metadata. See (#9749) for more details.
+* Delete dopped parts in multi-part upload. See (#9753) for more details.
+* Fix manually passing healing options. See (#9756) for more details.
+
+[1.114.0]
+* Update minio to 2020-06-14T18-32-17Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-06-14T18-32-17Z)
+* Fixes a regression in timeout for local lockers, See #9828 for more details
+
+[1.115.0]
+* Update minio to 2020-06-18T02-23-35Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-06-18T02-23-35Z)
+
+[1.116.0]
+* Update minio to 2020-06-22T03-12-50Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-06-22T03-12-50Z)
+
+[1.117.0]
+* Update minio to 2020-07-02T00-15-09Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-07-02T00-15-09Z)
+* fix: readiness needs to be like liveness. See (#9941) for more details.
+* Allow optionally to disable range caching. See (#9908) for more details.
+* Simplify background heal and trigger heal items early. See (#9928) for more details.
+* update gorilla deps for query parsing performance improvements. See (#9929) for more details.
+* Improvements to online status. See (#9858, #9808) for more details.
+* pop entries from each drives in parallel. See (#9918) for more details.
+
+[1.118.0]
+* Update minio to 2020-07-12T19-14-17Z
+* Avoid startup lock-up when nodes are coming online, fixes an issue with healthcheck routine which ended up reusing a downed client resulting in pereptual offline of that node - see #10026 for more details.
+* Finally fix the CORS regression introduced by incompatible usage after gorilla/mux update
+* fix: avoid broken link when preview image (#10021) (07/12/20) (Harshavardhana)
+* fix: cors handling again for not just OPTIONS request (#10025) (07/12/20) (Harshavardhana)
+* fix: make sure to use new restClient for healthcheck (#10026) (07/11/20) (Harshavardhana)
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-07-12T19-14-17Z)
+
+[1.119.0]
+* Update minio to 2020-07-14T19-14-30Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-07-14T19-14-30Z)
+* Handle array policies in JWT claim. See (#10041) for more details.
+* admin info was not correct in certain situations when nodes are offline, was also loosing information - this release fixes this - see #10015
+
+[1.120.0]
+* Update minio to 2020-07-18T18-48-16Z
+* [Full changelog](https://github.com/minio/minio/releases/tag/RELEASE.2020-07-18T18-48-16Z)
+* Multiple disk healing related bug fixes are available in this release related PRs #10076, #10073, #10069, #10058
+* Federated setups now automatically figure out the online server to proxy the requests to.
+* S3 BucketLifecycle API compatibility fixes.
+* Quota checks now run continously piggy backing on the crawler.

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "1.74.0",
+  "version": "1.120.0",
   "healthCheckPath": "/minio/login",
   "httpPort": 8000,
   "addons": {
@@ -13,16 +13,15 @@
   },
   "manifestVersion": 2,
   "website": "http://www.minio.io",
-  "minBoxVersion": "4.1.4",
+  "minBoxVersion": "5.3.0",
+  "forumUrl": "https://forum.cloudron.io/category/69/minio",
   "documentationUrl": "https://cloudron.io/documentation/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://cloudron-app-screenshots.s3.amazonaws.com/io.minio.cloudronapp/4fd3e8d3ef180ba5c2334790b6e6143f6d367f65/minio-browser-gateway.png",
+    "https://cloudron-app-screenshots.s3.amazonaws.com/io.minio.cloudronapp/4fd3e8d3ef180ba5c2334790b6e6143f6d367f65/minio-browser.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Minio <upstream>2019-08-07T01-59-21Z</upstream>.
+This app packages Minio <upstream>2020-07-14T19-14-30Z</upstream>.
 
 Minio is a distributed object storage server built for cloud applications and devops.
 

Dockerfile

@@ -1,13 +1,14 @@
-FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
+FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
+
+ARG VERSION=RELEASE.2020-07-18T18-48-16Z
 
-ARG VERSION=RELEASE.2019-08-07T01-59-21Z
 RUN mkdir -p /app/code \
-    && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio \
+    && wget https://dl.min.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" ]

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: `admin`
-* SecretKey: `secretkey`
+**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**

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": "^76.0.0",
-    "ejs": "^2.6.2",
+    "chromedriver": "^84.0.0",
+    "ejs": "^3.1.3",
     "expect.js": "^0.3.1",
-    "mkdirp": "^0.5.1",
-    "mocha": "^6.2.0",
-    "rimraf": "^2.6.3",
-    "selenium-server-standalone-jar": "^3.141.5",
+    "mkdirp": "^1.0.4",
+    "mocha": "^8.0.1",
+    "rimraf": "^3.0.2",
+    "selenium-server-standalone-jar": "^3.141.59",
     "selenium-webdriver": "^3.6.0",
-    "superagent": "^5.1.0"
+    "superagent": "^5.3.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 () {