1
0
mirror of https://git.cloudron.io/cloudron/minio-app synced 2025-09-14 17:09:08 +00:00

Compare commits

..

3 Commits

Author SHA1 Message Date
Girish Ramakrishnan
594b45051d Version 3.5.2 2023-06-03 10:26:25 +02:00
Girish Ramakrishnan
ed8e041180 Update tests 2023-06-03 10:26:21 +02:00
Girish Ramakrishnan
f9c0870c59 Update minio to 2023-06-02T23-17-26Z 2023-06-03 09:48:02 +02:00
6 changed files with 38 additions and 45 deletions

View File

@@ -1813,3 +1813,14 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
* Add object parity in listing V2M and listing versions M by @vadmeste in #17238
* allow specification of path/virtual style bucket lookup in batch replication by @poornas in #17201
* fix: Avoid Income globalStats twice upon error by @jiuker in #17263
[3.5.2]
* Update minio to 2023-06-02T23-17-26Z
* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-06-02T23-17-26Z)
* fix: on windows use FindClose close handler by @jiuker in #17306
* fix: cleanup empty multipart folders upon stale upload cleanup by @harshavardhana in #17312
* Revert s3 select simdjson reuse by @klauspost in #17310
* record err time when remote node is offline by @jiuker in #17262
* fix: proxy not set on subnet logger webhook sometimes by @anjalshireesh in #17320
* fix: time() returned function not being called as expected in globalSync() by @drivebyer in #17319
* fix: fail large content in DeleteMultipleObjects() early by @jiuker in #17321

View File

@@ -5,8 +5,8 @@
"description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG",
"tagline": "Distributed object storage",
"version": "3.5.1",
"upstreamVersion": "2023-05-27T05-56-19Z",
"version": "3.5.2",
"upstreamVersion": "2023-06-02T23-17-26Z",
"healthCheckPath": "/minio/login",
"memoryLimit": 805306368,
"httpPort": 8000,

View File

@@ -3,7 +3,7 @@ FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03
RUN mkdir -p /app/code
WORKDIR /app/code
ARG VERSION=RELEASE.2023-05-27T05-56-19Z
ARG VERSION=RELEASE.2023-06-02T23-17-26Z
# 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

45
test/package-lock.json generated
View File

@@ -9,11 +9,10 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"chromedriver": "^112.0.1",
"delay": "^5.0.0",
"chromedriver": "^114.0.1",
"expect.js": "^0.3.1",
"mocha": "^10.2.0",
"selenium-webdriver": "^4.9.0",
"selenium-webdriver": "^4.9.2",
"superagent": "^8.0.9"
}
},
@@ -229,9 +228,9 @@
}
},
"node_modules/chromedriver": {
"version": "112.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-112.0.1.tgz",
"integrity": "sha512-ieQzvellbtPY4MUrFzzayC1bZa/HoBsGXejUQJhAPWcYALxtkjUZNUYWbojMjIzf8iIhVda9VvdXiRKqdlN7ow==",
"version": "114.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.1.tgz",
"integrity": "sha512-Srkyt7xv+RL9aSNVkmARm0tAfw84fIBKge9c1MCTiHfW0tjuNFdhKVlgD0TmPmwSKOeFJrTdd1Flf2hGWWKsUw==",
"hasInstallScript": true,
"dependencies": {
"@testim/chrome-version": "^1.1.3",
@@ -383,17 +382,6 @@
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
},
"node_modules/delay": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
"integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -1202,9 +1190,9 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"node_modules/selenium-webdriver": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.0.tgz",
"integrity": "sha512-QGaPoREo7sgOVhTiAvCasoi1f4ruTaJDtp0RKNFIbfyns5smK5+iCwnRTIPXb0R3CAYdaqUXd6BHduh37DorzQ==",
"version": "4.9.2",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.2.tgz",
"integrity": "sha512-0gDswAgVn6qbCYckZetQQvQK9tWW1r7LaumhiqY1/Wl/7JEWG0JANsTbZKnmGc3+cUU76zAi5/p0P8LUweXlig==",
"dependencies": {
"jszip": "^3.10.1",
"tmp": "^0.2.1",
@@ -1720,9 +1708,9 @@
}
},
"chromedriver": {
"version": "112.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-112.0.1.tgz",
"integrity": "sha512-ieQzvellbtPY4MUrFzzayC1bZa/HoBsGXejUQJhAPWcYALxtkjUZNUYWbojMjIzf8iIhVda9VvdXiRKqdlN7ow==",
"version": "114.0.1",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.1.tgz",
"integrity": "sha512-Srkyt7xv+RL9aSNVkmARm0tAfw84fIBKge9c1MCTiHfW0tjuNFdhKVlgD0TmPmwSKOeFJrTdd1Flf2hGWWKsUw==",
"requires": {
"@testim/chrome-version": "^1.1.3",
"axios": "^1.2.1",
@@ -1837,11 +1825,6 @@
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
},
"delay": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
"integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw=="
},
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -2417,9 +2400,9 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"selenium-webdriver": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.0.tgz",
"integrity": "sha512-QGaPoREo7sgOVhTiAvCasoi1f4ruTaJDtp0RKNFIbfyns5smK5+iCwnRTIPXb0R3CAYdaqUXd6BHduh37DorzQ==",
"version": "4.9.2",
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.2.tgz",
"integrity": "sha512-0gDswAgVn6qbCYckZetQQvQK9tWW1r7LaumhiqY1/Wl/7JEWG0JANsTbZKnmGc3+cUU76zAi5/p0P8LUweXlig==",
"requires": {
"jszip": "^3.10.1",
"tmp": "^0.2.1",

View File

@@ -9,11 +9,10 @@
"author": "",
"license": "ISC",
"dependencies": {
"chromedriver": "^112.0.1",
"delay": "^5.0.0",
"chromedriver": "^114.0.1",
"expect.js": "^0.3.1",
"mocha": "^10.2.0",
"selenium-webdriver": "^4.9.0",
"selenium-webdriver": "^4.9.2",
"superagent": "^8.0.9"
}
}

View File

@@ -11,12 +11,12 @@
require('chromedriver');
const delay = require('delay'),
execSync = require('child_process').execSync,
const execSync = require('child_process').execSync,
expect = require('expect.js'),
fs = require('fs'),
path = require('path'),
superagent = require('superagent'),
timers = require('timers/promises'),
{ Builder, By, until } = require('selenium-webdriver'),
{ Options } = require('selenium-webdriver/chrome');
@@ -56,7 +56,7 @@ describe('Application life cycle test', function () {
await browser.findElement(By.id('secretKey')).sendKeys(secretKey);
await browser.findElement(By.xpath('//button[@id="do-login"]')).click();
await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
await delay(5000);
await timers.setTimeout(5000);
}
async function logout() {
@@ -76,7 +76,7 @@ describe('Application life cycle test', function () {
await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
await delay(5000);
await timers.setTimeout(5000);
}
async function checkBucket() {
@@ -99,7 +99,7 @@ describe('Application life cycle test', function () {
xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
it('install app', async function () {
execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
await delay(10000);
await timers.setTimeout(10000);
});
it('can get app information', getAppInfo);
@@ -118,7 +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 delay(10000);
await timers.setTimeout(10000);
});
it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
@@ -136,7 +136,7 @@ describe('Application life cycle test', function () {
execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
getAppInfo();
execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
await delay(10000);
await timers.setTimeout(10000);
});
it('can login', login.bind(null, 'minioakey', 'minioskey'));
@@ -148,7 +148,7 @@ describe('Application life cycle test', function () {
it('move to different location', async function () {
browser.manage().deleteAllCookies();
execSync('cloudron configure --location ' + LOCATION + '2', EXEC_ARGS);
await delay(10000);
await timers.setTimeout(10000);
});
it('can get app information', getAppInfo);