From 23c976c525e19d2d9671b8c32545c94d5b3fb898 Mon Sep 17 00:00:00 2001
From: zaucy <ezekiel@robotoppression.com>
Date: Wed, 27 Jun 2018 19:53:55 -0700
Subject: [PATCH 1/4] Exposed the 'env' option on child_process.exec

---
 index.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index fb93154..eb79d2f 100644
--- a/index.js
+++ b/index.js
@@ -37,12 +37,14 @@ const configToArgs = config => {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const execCompose = (command, options) => new Promise((resolve, reject) => {
   const cmd = `docker-compose ${configToArgs(options.config)} ${command}`;
   const cwd = options.cwd;
+  const env = options.env || null;
 
-  execute(cmd, { cwd }).then(
+  execute(cmd, { cwd, env }).then(
       standards => {
         const std = {
           out: standards[0],
@@ -68,6 +70,7 @@ const execCompose = (command, options) => new Promise((resolve, reject) => {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const up = function (options) {
   return execCompose('up -d', options);
@@ -78,6 +81,7 @@ const up = function (options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const down = function (options) {
   return execCompose('down', options);
@@ -88,6 +92,7 @@ const down = function (options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const stop = function (options) {
   return execCompose('stop', options);
@@ -98,6 +103,7 @@ const stop = function (options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const kill = function (options) {
   return execCompose('kill', options);
@@ -108,6 +114,7 @@ const kill = function (options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  */
 const rm = function (options) {
   return execCompose('rm -f', options);
@@ -121,6 +128,7 @@ const rm = function (options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  *
  * @return {object} std.out / std.err
  */
@@ -136,6 +144,7 @@ const exec = function (container, command, options) {
  * @param {string} options.cwd
  * @param {boolean} [options.log]
  * @param {?(string|string[])} [options.config]
+ * @param {?object} [options.env]
  *
  * @return {object} std.out / std.err
  */

From 182324ecc05c182b12df28ee2a61af8cfdff91f2 Mon Sep 17 00:00:00 2001
From: Alexander Zeitler <alexander.zeitler@pdmlab.com>
Date: Thu, 28 Jun 2018 10:57:48 +0200
Subject: [PATCH 2/4] Update license

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index fdc21c7..6b1e8b9 100644
--- a/readme.md
+++ b/readme.md
@@ -77,7 +77,7 @@ Also please add tests and make sure to run `npm run eslint`.
 
 MIT License
 
-Copyright (c) 2017 PDMLab
+Copyright (c) 2018 PDMLab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From ed55a52afd84c704b7aee1631927e0d828e1a362 Mon Sep 17 00:00:00 2001
From: Alexander Zeitler <alexander.zeitler@pdmlab.com>
Date: Thu, 28 Jun 2018 10:59:40 +0200
Subject: [PATCH 3/4] Add contributor Ezekiel Warren

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 7019c1f..975c6d0 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
     {
       "name": "Ignatiev Mikhail"
     },
+    {
+      "name": "Ezekiel Warren"
+    },
     {
       "name": "Palash Mondal"
     }

From 4954d8ab6d1ef6b6f8ccf8c61f2721e358f78ddb Mon Sep 17 00:00:00 2001
From: Alexander Zeitler <alexander.zeitler@pdmlab.com>
Date: Thu, 28 Jun 2018 11:06:54 +0200
Subject: [PATCH 4/4] update version to 0.7.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d903226..d4737b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-compose",
-  "version": "0.4.3",
+  "version": "0.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 975c6d0..7fa4ada 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-compose",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/.bin/tape test",