Skip to content

Commit

Permalink
Merge branch 'feature/document-env-vars' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dani8art committed Oct 29, 2017
2 parents f6f4da8 + c232088 commit 42e304f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
20 changes: 19 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This method receives a URI of a file and builds, (re)creates, starts, and attach
**file** | `string` | **Required.** The file where the service is described.
**options** | `[string]` | **Optional.** Docker compose up commad [options](https://docs.docker.com/compose/reference/up/).

#### Example
#### Examples

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

For passing environment variables to the `docker-compose` command, It is used the `process.env` global variable as follow:

```javascript
var dcManager = require('docker-composer-manager');
var file = __dirname + '/docker-compose.yaml';

process.env.MONGO_VERSION = '3.0.15';

dcManager.dockerComposeUp(file).then(() => {
return dcManager.dockerExec('withenvironment_mongo_1', ['mongo', '--version']);
}).then((out) => {
return Promise.resolve(expect(out.indexOf('3.0.15')).to.not.be.equal(-1));
}).then(() => {
return dcManager.dockerComposeDown(file);
}).then(() => done()).catch(err => done(err));
```


### DockerComposeDown

This method receives a URI of a file and stops containers, removes containers, networks, volumes, and images created by [dockerComposeUp](#dockercomposeup).
Expand Down
3 changes: 2 additions & 1 deletion src/docker-compose-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ function dockerExec(container, exec_command, options) {

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

Expand Down

0 comments on commit 42e304f

Please sign in to comment.