From e12f289d9def23a30197610a6836b9512dc57b0b Mon Sep 17 00:00:00 2001
From: Petros Angelatos <petrosagg@gmail.com>
Date: Fri, 23 Sep 2016 15:15:00 -0700
Subject: [PATCH] build: fix multiple env var definition syntax

When an ENV command has multiple environment variables defined they
key/value should be separated by an equals sign, not by a space.

Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
---
 CHANGELOG.md                |  2 ++
 Dockerfile.runtime.template |  6 +++---
 Makefile                    | 18 +++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db14f9a9..db566479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fix ENV bug in build process [petrosagg]
+
 # v2.2.0
 
 * Add resin-vpn interface IP filtering to gosupervisor [Praneeth]
diff --git a/Dockerfile.runtime.template b/Dockerfile.runtime.template
index ea3b5600..54bb4261 100644
--- a/Dockerfile.runtime.template
+++ b/Dockerfile.runtime.template
@@ -10,9 +10,9 @@ COPY ./build/%%ARCH%%/rootfs-overlay/ /
 
 VOLUME /data
 
-ENV CONFIG_MOUNT_POINT /boot/config.json \
-	LED_FILE /dev/null \
-	SUPERVISOR_IMAGE resin/%%ARCH%%-supervisor
+ENV CONFIG_MOUNT_POINT=/boot/config.json \
+	LED_FILE=/dev/null \
+	SUPERVISOR_IMAGE=resin/%%ARCH%%-supervisor
 
 CMD [ "/sbin/init" ]
 
diff --git a/Makefile b/Makefile
index a30e2768..b8e796a7 100644
--- a/Makefile
+++ b/Makefile
@@ -133,20 +133,20 @@ refresh-supervisor-src:
 
 supervisor: nodesuper gosuper
 	sed 's/%%ARCH%%/$(ARCH)/g' Dockerfile.runtime.template > Dockerfile.runtime.$(ARCH)
-	echo "ENV VERSION $(shell jq -r .version package.json) \\" >> Dockerfile.runtime.$(ARCH)
-	echo "    DEFAULT_PUBNUB_PUBLISH_KEY $(PUBNUB_PUBLISH_KEY) \\" >> Dockerfile.runtime.$(ARCH)
-	echo "    DEFAULT_PUBNUB_SUBSCRIBE_KEY $(PUBNUB_SUBSCRIBE_KEY) \\" >> Dockerfile.runtime.$(ARCH)
-	echo "    DEFAULT_MIXPANEL_TOKEN $(MIXPANEL_TOKEN)" >> Dockerfile.runtime.$(ARCH)
+	echo "ENV VERSION=$(shell jq -r .version package.json) \\" >> Dockerfile.runtime.$(ARCH)
+	echo "    DEFAULT_PUBNUB_PUBLISH_KEY=$(PUBNUB_PUBLISH_KEY) \\" >> Dockerfile.runtime.$(ARCH)
+	echo "    DEFAULT_PUBNUB_SUBSCRIBE_KEY=$(PUBNUB_SUBSCRIBE_KEY) \\" >> Dockerfile.runtime.$(ARCH)
+	echo "    DEFAULT_MIXPANEL_TOKEN=$(MIXPANEL_TOKEN)" >> Dockerfile.runtime.$(ARCH)
 ifdef rt_https_proxy
-	echo "ENV HTTPS_PROXY $(rt_https_proxy) \\" >> Dockerfile.runtime.$(ARCH)
-	echo "    https_proxy $(rt_https_proxy)" >> Dockerfile.runtime.$(ARCH)
+	echo "ENV HTTPS_PROXY=$(rt_https_proxy) \\" >> Dockerfile.runtime.$(ARCH)
+	echo "    https_proxy=$(rt_https_proxy)" >> Dockerfile.runtime.$(ARCH)
 endif
 ifdef rt_http_proxy
-	echo "ENV HTTP_PROXY $(rt_http_proxy) \\" >> Dockerfile.runtime.$(ARCH)
-	echo "    http_proxy $(rt_http_proxy)" >> Dockerfile.runtime.$(ARCH)
+	echo "ENV HTTP_PROXY=$(rt_http_proxy) \\" >> Dockerfile.runtime.$(ARCH)
+	echo "    http_proxy=$(rt_http_proxy)" >> Dockerfile.runtime.$(ARCH)
 endif
 ifdef rt_no_proxy
-	echo "ENV no_proxy $(rt_no_proxy)" >> Dockerfile.runtime.$(ARCH)
+	echo "ENV no_proxy=$(rt_no_proxy)" >> Dockerfile.runtime.$(ARCH)
 endif
 	docker build \
 		$(DOCKER_HTTP_PROXY) \