Skip to content

Commit 25a104a

Browse files
committed
Merge branch 'master' into develop
2 parents 470f72f + e503719 commit 25a104a

13 files changed

+32
-16
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
### v0.1.2 - 2017-10-24
2+
3+
- [#22](https://github.com/dani8art/docker-compose-manager/issues/22) - Remove '-d' option from dockerComposeUp command
4+
5+
- [#21](https://github.com/dani8art/docker-compose-manager/issues/21) - Update the version of 'grunt-release-github' to version 2.0.0
6+
7+
- [#20](https://github.com/dani8art/docker-compose-manager/issues/20) - update documentation with the actual name "docker-composer-manager"
8+
19
### v0.1.0 - 2017-71-1
210

311
- [#13](https://github.com/dani8art/docker-compose-manager/issues/13) - Remove BETA notice on README.md

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ For technical inquiry please contact to [engineering team](http://github.com/dan
1212

1313
[![Build Status](https://travis-ci.org/dani8art/docker-compose-manager.svg?branch=master)](https://travis-ci.org/http://github.com/dani8art/docker-compose-manager)
1414

15-
The version 0.1.0 is the latest stable version of docker-composer-manager component.
16-
see [release note](http://github.com/dani8art/docker-compose-manager/releases/tag/0.1.0) for details.
15+
The version 0.1.2 is the latest stable version of docker-composer-manager component.
16+
see [release note](http://github.com/dani8art/docker-compose-manager/releases/tag/0.1.2) for details.
1717

18-
- Download this latest version from [0.1.0](http://github.com/dani8art/docker-compose-manager/releases/tag/0.1.0)
18+
- Download this latest version from [0.1.2](http://github.com/dani8art/docker-compose-manager/releases/tag/0.1.2)
1919
- For usage instructions please read [documentation](http://github.com/dani8art/docker-compose-manager/tree/master/docs)

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "docker-composer-manager",
3-
"buildOn": "2017-08-01",
4-
"version": "0.1.0",
3+
"buildOn": "2017-10-24",
4+
"version": "0.1.2",
55
"description": "A NPM module to manage docker containers using docker-compose",
66
"homepage": "https://github.com/dani8art/docker-compose-manager",
77
"main": "index.js",
@@ -43,4 +43,4 @@
4343
"web": "http://darteaga.com"
4444
},
4545
"license": "GPL-3.0+"
46-
}
46+
}

src/cmd/cmd.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager
@@ -17,6 +17,7 @@ GNU General Public License for more details.
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1919

20+
2021
'use strict';
2122

2223
/**

src/docker-compose-manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager

src/logger/logger.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager
@@ -17,6 +17,7 @@ GNU General Public License for more details.
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1919

20+
2021
'use strict';
2122

2223
/**

tests/00-module/001-dc-manager.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager
@@ -17,6 +17,7 @@ GNU General Public License for more details.
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1919

20+
2021
'use strict';
2122

2223
process.env.NODE_ENV = "test";

tests/00-module/002-dc-up.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager
@@ -17,6 +17,7 @@ GNU General Public License for more details.
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1919

20+
2021
'use strict';
2122

2223
process.env.NODE_ENV = "development";

tests/00-module/003-dc-stop.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
docker-composer-manager 0.1.0, built on: 2017-08-01
2+
docker-composer-manager 0.1.2, built on: 2017-10-24
33
Copyright (C) 2017 Daniel Arteaga
44
http://darteaga.com
55
https://github.com/dani8art/docker-compose-manager
@@ -17,6 +17,7 @@ GNU General Public License for more details.
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1919

20+
2021
'use strict';
2122

2223
process.env.NODE_ENV = "development";

0 commit comments

Comments
 (0)