Merged
This commit is contained in:
commit
8d5c6027c7
|
@ -25,3 +25,6 @@
|
||||||
|
|
||||||
[0.2.6]
|
[0.2.6]
|
||||||
* Updated to 2017-05-05T01-14-51Z
|
* Updated to 2017-05-05T01-14-51Z
|
||||||
|
|
||||||
|
[0.2.7]
|
||||||
|
* Updated to 2017-06-13T19-01-01Z
|
||||||
|
|
|
@ -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.6",
|
"version": "0.2.7",
|
||||||
"healthCheckPath": "/minio/login",
|
"healthCheckPath": "/minio/login",
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
"addons": {
|
"addons": {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
This app packages Minio <upstream>2017-05-05T01-14-51Z</upstream>
|
This app packages Minio <upstream>2017-06-13T19-01-01Z</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.
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@ MAINTAINER Minio Developers <support@cloudron.io>
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
ENV VERSION 2017-05-05T01-14-51Z
|
ENV VERSION 2017-06-13T19-01-01Z
|
||||||
|
|
||||||
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
|
||||||
|
|
|
@ -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
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ 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;
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ describe('Application life cycle test', function () {
|
||||||
|
|
||||||
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');
|
||||||
|
|
Loading…
Reference in New Issue