1
0
mirror of https://git.cloudron.io/cloudron/minio-app synced 2025-09-13 16:29:13 +00:00

Compare commits

..

21 Commits

Author SHA1 Message Date
Dennis Schwerdel
fe319108a5 Version 1.3.0 2017-11-26 22:59:48 +01:00
Dennis Schwerdel
6bfe0bb79d Merge branch 'master' of ssh://git.cloudron.io:6000/cloudron/minio-app 2017-11-26 22:38:24 +01:00
Girish Ramakrishnan
75b29cd1a2 Version 1.2.0 2017-10-31 11:38:55 -07:00
Girish Ramakrishnan
77b9ac57ff Use minio 2017-10-27T18-59-02Z 2017-10-31 11:32:10 -07:00
Girish Ramakrishnan
d5a565aa9c Merge branch 'RELEASE.2017-09-29T19-16-56Z' into 'master'
Release.2017-09-29-t19-16-56z

See merge request cloudron/minio-app!1
2017-10-14 17:43:08 +00:00
Girish Ramakrishnan
c9992474a7 Version 1.1.0 2017-10-13 13:43:57 -07:00
Girish Ramakrishnan
24a8d0530d Set minBoxVersion
Mozilla UA is required for healthcheck to work

https://github.com/minio/minio/issues/5010
2017-10-13 13:43:57 -07:00
Girish Ramakrishnan
a05b2e9f29 Update minio to RELEASE.2017-09-29T19-16-56Z 2017-10-13 13:43:46 -07:00
Dennis Schwerdel
8d5c6027c7 Merged 2017-10-04 10:19:00 +02:00
Dennis Schwerdel
83631e75e7 Merged 2017-10-04 10:18:26 +02:00
Girish Ramakrishnan
9a18f50342 Version 1.0.0 2017-09-20 14:41:14 -07:00
Girish Ramakrishnan
fc97bcedae Update minio to 2017-08-05T00-00-53Z 2017-09-20 14:35:36 -07:00
Girish Ramakrishnan
a2f6725f98 add restart and update tests 2017-09-20 14:30:46 -07:00
Girish Ramakrishnan
1b03bf232f Version 0.3.0 2017-09-20 14:15:01 -07:00
Girish Ramakrishnan
9d08c703e9 Update to 2017-07-24T18-27-35Z 2017-09-20 14:06:50 -07:00
Dennis Schwerdel
3b2df1b8a1 Updated to 2017-06-13T19-01-01Z 2017-06-14 22:46:14 +02:00
Dennis Schwerdel
e4e84d7a26 Updated tests 2017-06-14 22:45:46 +02:00
Dennis Schwerdel
3aa0241db8 Minor changes to tests & description 2017-06-02 19:50:25 +02:00
Dennis Schwerdel
4dc396041e Updated to 2017-05-05T01-14-51Z 2017-05-05 08:59:34 +02:00
Girish Ramakrishnan
1f1caec809 Add upstream tag to description 2017-05-03 21:50:21 -07:00
Dennis Schwerdel
027524dbd3 Updated to 2017-04-29T00-40-27Z 2017-05-01 13:11:43 +02:00
6 changed files with 135 additions and 64 deletions

View File

@@ -19,3 +19,28 @@
[0.2.4] [0.2.4]
* Updated to 2017-04-25T01-27-49Z * Updated to 2017-04-25T01-27-49Z
[0.2.5]
* Updated to 2017-04-29T00-40-27Z
[0.2.6]
* Updated to 2017-05-05T01-14-51Z
[0.2.7]
* Updated to 2017-06-13T19-01-01Z
[0.3.0]
* Update to 2017-07-24T18-27-35Z
[1.0.0]
* Update to 2017-08-05T00-00-53Z
[1.1.0]
* Update to 2017-09-29T19-16-56Z
* This version requires at Cloudron v1.7.2
[1.2.0]
* Update to 2017-10-27T18-59-02Z
[1.3.0]
* Update to 2017-11-22T19-55-46Z

View File

@@ -5,7 +5,7 @@
"description": "file://DESCRIPTION.md", "description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG", "changelog": "file://CHANGELOG",
"tagline": "Distributed object storage", "tagline": "Distributed object storage",
"version": "0.2.4", "version": "1.3.0",
"healthCheckPath": "/minio/login", "healthCheckPath": "/minio/login",
"httpPort": 8000, "httpPort": 8000,
"addons": { "addons": {
@@ -13,6 +13,7 @@
}, },
"manifestVersion": 1, "manifestVersion": 1,
"website": "http://www.minio.io", "website": "http://www.minio.io",
"minBoxVersion": "1.7.2",
"contactEmail": "support@cloudron.io", "contactEmail": "support@cloudron.io",
"icon": "logo.png", "icon": "logo.png",
"tags": [ "tags": [

View File

@@ -1,4 +1,4 @@
This app packages Minio. This app packages Minio <upstream>2017-11-22T19-55-46Z</upstream>.
Minio is a distributed object storage server built for cloud applications and devops. Minio is a distributed object storage server built for cloud applications and devops.

View File

@@ -3,10 +3,10 @@ MAINTAINER Minio Developers <support@cloudron.io>
EXPOSE 8000 EXPOSE 8000
ENV VERSION 2017-04-25T01-27-49Z ENV VERSION 2017-11-22T19-55-46Z
RUN mkdir -p /app/code \ RUN mkdir -p /app/code \
&& wget https://dl.minio.io/server/minio/release/linux-amd64/archive/minio.RELEASE.${VERSION} -O /app/code/minio \ && wget https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.${VERSION} -O /app/code/minio \
&& chmod +x /app/code/minio && chmod +x /app/code/minio
WORKDIR /app/code WORKDIR /app/code

View File

@@ -31,7 +31,6 @@ The e2e tests are located in the `test/` folder and require [nodejs](http://node
cd minio-app/test cd minio-app/test
npm install npm install
export PATH=$PATH:node_modules/.bin PATH=$PATH:node_modules/.bin mocha --bail test.js
mocha --bail test.js
``` ```

View File

@@ -13,9 +13,7 @@ var by = webdriver.By,
var accessKey = 'admin', var accessKey = 'admin',
secretKey = 'secretkey'; secretKey = 'secretkey';
var bucket_prefix = 'bucket', var bucket = 'cloudrontestbucket';
bucket_id = 0,
bucket;
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -41,85 +39,104 @@ describe('Application life cycle test', function () {
done(); done();
}); });
var LOCATION = 'minio-test'; var LOCATION = 'test';
var TEST_TIMEOUT = 10000; var TEST_TIMEOUT = 10000;
var app; var app;
function pageLoaded(callback) { function pageLoaded() {
return browser.wait(until.elementLocated(by.className('page-load pl-0 pl-1')), TEST_TIMEOUT).then(function () { return browser.wait(until.elementLocated(by.className('page-load pl-0 pl-1')), TEST_TIMEOUT);
callback();
});
} }
function visible(selector, callback) { function visible(selector) {
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () { return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () { return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
callback();
});
}); });
} }
function login(callback) { function login(callback) {
browser.manage().deleteAllCookies(); browser.manage().deleteAllCookies();
browser.get('https://' + app.fqdn); browser.get('https://' + app.fqdn).then(function () {
return visible(by.id('accessKey'));
visible(by.id('accessKey'), function () { }).then(function () {
browser.findElement(by.id('accessKey')).sendKeys(accessKey); return browser.findElement(by.id('accessKey')).sendKeys(accessKey);
browser.findElement(by.id('secretKey')).sendKeys(secretKey); }).then(function () {
browser.findElement(by.className('lw-btn')).click(); return browser.findElement(by.id('secretKey')).sendKeys(secretKey);
browser.wait(until.elementLocated(by.id('top-right-menu')), TEST_TIMEOUT).then(function () { callback(); }); }).then(function () {
return browser.findElement(by.className('lw-btn')).click();
}).then(function () {
return browser.wait(until.elementLocated(by.id('top-right-menu')), TEST_TIMEOUT);
}).then(function () {
callback();
}); });
} }
function logout(callback) { function logout(callback) {
browser.get('https://' + app.fqdn); browser.get('https://' + app.fqdn);
pageLoaded(function () { pageLoaded().then(function () {
visible(by.id('top-right-menu'), function () { return visible(by.id('top-right-menu'));
browser.findElement(by.id('top-right-menu')).click(); }).then(function () {
visible(by.xpath('//*[text()="Sign Out "]'), function () { return browser.findElement(by.id('top-right-menu')).click();
browser.findElement(by.xpath('//*[text()="Sign Out "]')).click(); }).then(function () {
return visible(by.xpath('//*[text()="Sign Out "]'));
browser.wait(until.elementLocated(by.id('accessKey')), TEST_TIMEOUT).then(function () { callback(); }); }).then(function () {
}); return browser.findElement(by.xpath('//*[text()="Sign Out "]')).click();
}); }).then(function () {
return browser.wait(until.elementLocated(by.id('accessKey')), TEST_TIMEOUT);
}).then(function () {
callback();
}); });
} }
function addBucket(callback) { function addBucket(callback) {
bucket_id = bucket_id + 1;
bucket = bucket_prefix + bucket_id;
browser.get('https://' + app.fqdn); browser.get('https://' + app.fqdn);
pageLoaded(function () { pageLoaded().then(function () {
visible(by.className('fa fa-plus'), function () { return visible(by.className('fa fa-plus'));
browser.findElement(by.className('fa fa-plus')).click(); }).then(function () {
visible(by.className('fa fa-hdd-o'), function () { return browser.findElement(by.className('fa fa-plus')).click();
browser.findElement(by.className('fa fa-hdd-o')).click(); }).then(function () {
visible(by.xpath('//*[@class="modal-body"]/form/div/input'), function() { return visible(by.className('fa fa-hdd-o'));
browser.findElement(by.xpath('//*[@class="modal-body"]/form/div/input')).sendKeys(bucket); }).then(function () {
browser.findElement(by.xpath('//*[@class="modal-body"]/form')).submit(); return browser.findElement(by.className('fa fa-hdd-o')).click();
visible(by.xpath('//*[@class="main"]/a[text()="' + bucket + '"]'), function() { }).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(); callback();
}); });
}); }
});
}); 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) { function openSettings(callback) {
browser.get('https://' + app.fqdn); browser.get('https://' + app.fqdn);
pageLoaded(function () { pageLoaded().then(function () {
visible(by.id('top-right-menu'), function () { return visible(by.id('top-right-menu'));
browser.findElement(by.id('top-right-menu')).click(); }).then(function () {
visible(by.xpath('//*[text()="Settings "]'), function () { return browser.findElement(by.id('top-right-menu')).click();
browser.findElement(by.xpath('//*[text()="Settings "]')).click(); }).then(function () {
return visible(by.xpath('//*[text()="Settings "]'));
browser.wait(until.elementLocated(by.xpath('//*[text()="Generate"]')), TEST_TIMEOUT).then(function () { callback(); }); }).then(function () {
}); return browser.findElement(by.xpath('//*[text()="Settings "]')).click();
}); }).then(function () {
return browser.wait(until.elementLocated(by.xpath('//*[text()="Generate"]')), TEST_TIMEOUT);
}).then(function () {
callback();
}); });
} }
@@ -140,10 +157,19 @@ describe('Application life cycle test', function () {
}); });
it('can login', login); it('can login', login);
it('can add buckets', addBucket); it('can add bucket', addBucket);
it('can open settings', openSettings); it('can open settings', openSettings);
it('can logout', logout); it('can logout', logout);
it('can restart app', function (done) {
execSync('cloudron restart --wait');
done();
});
it('can login', login);
it('has bucket', checkBucket);
it('can logout', logout);
it('backup app', function () { it('backup app', function () {
execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }); execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
}); });
@@ -153,25 +179,45 @@ describe('Application life cycle test', function () {
}); });
it('can login', login); it('can login', login);
it('can add buckets', addBucket); it('has bucket', checkBucket);
it('can open settings', openSettings); it('can open settings', openSettings);
it('can logout', logout); it('can logout', logout);
it('move to different location', function () { it('move to different location', function () {
browser.manage().deleteAllCookies(); browser.manage().deleteAllCookies();
execSync('cloudron configure --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }); execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
var inspect = JSON.parse(execSync('cloudron inspect')); var inspect = JSON.parse(execSync('cloudron inspect'));
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0]; app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
expect(app).to.be.an('object'); expect(app).to.be.an('object');
}); });
it('can login', login); it('can login', login);
it('can add buckets', addBucket); it('has bucket', checkBucket);
it('can open settings', openSettings);
it('can logout', logout); it('can logout', logout);
it('uninstall app', function () { it('uninstall app', function () {
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }); execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
}); });
// 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' });
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 add buckets', addBucket);
it('can logout', logout);
it('can update', function () {
execSync('cloudron install --wait --app ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
it('can login', login);
it('has bucket', checkBucket);
it('can logout', logout);
it('uninstall app', function () {
execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
});