From 6ddc7275dd10c4058d9d57b768460274840a8113 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <myaccounts@savant.be>
Date: Tue, 25 Nov 2014 11:22:16 -0500
Subject: [PATCH 1/5] First pass at official user-env-compile plugin

- Uses ENV and APP/ENV files
- Supports old BUILD_ENV files (which are likely in wide-use)
- Allows user's to override globals with app-specific configuration

Closes #284
Closes #683
Closes #763

Refs #503
Refs #678
---
 plugins/build-env/pre-build | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/build-env/pre-build

diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
new file mode 100644
index 000000000..86b6c01f1
--- /dev/null
+++ b/plugins/build-env/pre-build
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV=""
+
+if [[ -f "$DOKKU_ROOT/ENV" ]]; then
+  BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
+fi
+if [[ -f "$DOKKU_ROOT/BUILD_ENV" ]]; then
+  BUILD_ENV+=$(< "$DOKKU_ROOT/BUILD_ENV")
+fi
+if [[ -f "$DOKKU_ROOT/APP/ENV" ]]; then
+  BUILD_ENV+=$(< "$DOKKU_ROOT/APP/ENV")
+fi
+
+if [[ ! -z "$BUILD_ENV" ]]; then
+  echo "-----> Adding BUILD_ENV to build environment..."
+  id=$(echo "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
+  test $(docker wait $id) -eq 0
+  docker commit $id $IMAGE > /dev/null
+fi

From d9d66c58abe573238eeaee75b7a5b75f981eebf3 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <myaccounts@savant.be>
Date: Mon, 8 Dec 2014 22:16:05 -0500
Subject: [PATCH 2/5] Fix reference to $APP

---
 plugins/build-env/pre-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
index 86b6c01f1..eee9c7e19 100644
--- a/plugins/build-env/pre-build
+++ b/plugins/build-env/pre-build
@@ -9,8 +9,8 @@ fi
 if [[ -f "$DOKKU_ROOT/BUILD_ENV" ]]; then
   BUILD_ENV+=$(< "$DOKKU_ROOT/BUILD_ENV")
 fi
-if [[ -f "$DOKKU_ROOT/APP/ENV" ]]; then
-  BUILD_ENV+=$(< "$DOKKU_ROOT/APP/ENV")
+if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
+  BUILD_ENV+=$(< "$DOKKU_ROOT/$APP/ENV")
 fi
 
 if [[ ! -z "$BUILD_ENV" ]]; then

From 7d5e0ba5aaa454bed5c0766d13f5d5bdaf054bf1 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <mh@expa.com>
Date: Thu, 11 Dec 2014 11:02:59 -0800
Subject: [PATCH 3/5] create build env for both dokku and new style buildpacks

---
 plugins/build-env/pre-build | 8 ++++++++
 1 file changed, 8 insertions(+)
 mode change 100644 => 100755 plugins/build-env/pre-build

diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
old mode 100644
new mode 100755
index eee9c7e19..efa7458e0
--- a/plugins/build-env/pre-build
+++ b/plugins/build-env/pre-build
@@ -7,14 +7,22 @@ if [[ -f "$DOKKU_ROOT/ENV" ]]; then
   BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
 fi
 if [[ -f "$DOKKU_ROOT/BUILD_ENV" ]]; then
+  BUILD_ENV+=" "
   BUILD_ENV+=$(< "$DOKKU_ROOT/BUILD_ENV")
 fi
 if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
+  BUILD_ENV+=" "
   BUILD_ENV+=$(< "$DOKKU_ROOT/$APP/ENV")
 fi
 
 if [[ ! -z "$BUILD_ENV" ]]; then
   echo "-----> Adding BUILD_ENV to build environment..."
+  # create build env files for use in buildpacks like this: https://github.com/niteoweb/heroku-buildpack-buildout/blob/master/bin/compile#L34
+  id=$(echo $BUILD_ENV |sed 's@export @@g'| docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in `cat`; do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \2 >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
+  test $(docker wait $id) -eq 0
+  docker commit $id $IMAGE > /dev/null
+
+  # create build env for 'old style' buildpacks and dokku plugins
   id=$(echo "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
   test $(docker wait $id) -eq 0
   docker commit $id $IMAGE > /dev/null

From 498e250e2e11eed3140afbe24dd5e2abd9218a4d Mon Sep 17 00:00:00 2001
From: Michael Hobbs <mh@expa.com>
Date: Thu, 11 Dec 2014 12:52:04 -0800
Subject: [PATCH 4/5] link to commit id and line in comment

---
 plugins/build-env/pre-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
index efa7458e0..3ffabcbcf 100755
--- a/plugins/build-env/pre-build
+++ b/plugins/build-env/pre-build
@@ -17,7 +17,8 @@ fi
 
 if [[ ! -z "$BUILD_ENV" ]]; then
   echo "-----> Adding BUILD_ENV to build environment..."
-  # create build env files for use in buildpacks like this: https://github.com/niteoweb/heroku-buildpack-buildout/blob/master/bin/compile#L34
+  # create build env files for use in buildpacks like this:
+  # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
   id=$(echo $BUILD_ENV |sed 's@export @@g'| docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in `cat`; do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \2 >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
   test $(docker wait $id) -eq 0
   docker commit $id $IMAGE > /dev/null

From 7c8feb9e0dcf8a33f9f31e85e4c6e980c7338517 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <mh@expa.com>
Date: Thu, 11 Dec 2014 14:56:25 -0800
Subject: [PATCH 5/5] build-env todos

---
 plugins/build-env/pre-build | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
index 3ffabcbcf..3343c357a 100755
--- a/plugins/build-env/pre-build
+++ b/plugins/build-env/pre-build
@@ -3,13 +3,14 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV=""
 
+[[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV"
+
+[[ ! $(grep CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV") ]] && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV"
+[[ ! $(grep CURL_TIMEOUT "$DOKKU_ROOT/ENV") ]] && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV"
+
 if [[ -f "$DOKKU_ROOT/ENV" ]]; then
   BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
 fi
-if [[ -f "$DOKKU_ROOT/BUILD_ENV" ]]; then
-  BUILD_ENV+=" "
-  BUILD_ENV+=$(< "$DOKKU_ROOT/BUILD_ENV")
-fi
 if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
   BUILD_ENV+=" "
   BUILD_ENV+=$(< "$DOKKU_ROOT/$APP/ENV")