Skip to content

Commit 42e304f

Browse files
committed
Merge branch 'feature/document-env-vars' into develop
2 parents f6f4da8 + c232088 commit 42e304f

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

docs/README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This method receives a URI of a file and builds, (re)creates, starts, and attach
2727
**file** | `string` | **Required.** The file where the service is described.
2828
**options** | `[string]` | **Optional.** Docker compose up commad [options](https://docs.docker.com/compose/reference/up/).
2929

30-
#### Example
30+
#### Examples
3131

3232
```javascript
3333
var dcManager = require('docker-composer-manager');
@@ -40,6 +40,24 @@ dcManager.dockerComposeUp(file).then(out => {
4040
});
4141
```
4242

43+
For passing environment variables to the `docker-compose` command, It is used the `process.env` global variable as follow:
44+
45+
```javascript
46+
var dcManager = require('docker-composer-manager');
47+
var file = __dirname + '/docker-compose.yaml';
48+
49+
process.env.MONGO_VERSION = '3.0.15';
50+
51+
dcManager.dockerComposeUp(file).then(() => {
52+
return dcManager.dockerExec('withenvironment_mongo_1', ['mongo', '--version']);
53+
}).then((out) => {
54+
return Promise.resolve(expect(out.indexOf('3.0.15')).to.not.be.equal(-1));
55+
}).then(() => {
56+
return dcManager.dockerComposeDown(file);
57+
}).then(() => done()).catch(err => done(err));
58+
```
59+
60+
4361
### DockerComposeDown
4462

4563
This method receives a URI of a file and stops containers, removes containers, networks, volumes, and images created by [dockerComposeUp](#dockercomposeup).

src/docker-compose-manager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ function dockerExec(container, exec_command, options) {
184184

185185
function dockerInspectIPAddressOfContainer(container, options) {
186186
return new Promise((resolve, reject) => {
187-
options = options ? options : [];
187+
options = options ? options : {};
188+
if (!options.network) options.network = 'bridge';
188189
var command = 'docker';
189190
var arg = ['inspect', '--format', "'{{.NetworkSettings.Networks." + options.network + ".IPAddress}}'", container];
190191

0 commit comments

Comments
 (0)