From 495cda660fd387a071dc4e874be1ed8f9e07bb10 Mon Sep 17 00:00:00 2001
From: starsoccer <>
Date: Wed, 13 Sep 2023 10:12:51 -0400
Subject: [PATCH] Attempt to add ability to set enviroment variable to be
 passed to nginx

# Conflicts:
#	energysmart-proxy/Dockerfile
---
 docker-compose.yml                                    | 2 ++
 energysmart-proxy/Dockerfile                          | 4 ++--
 energysmart-proxy/{nginx.conf => nginx.conf.template} | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename energysmart-proxy/{nginx.conf => nginx.conf.template} (96%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 461e5cc..5316355 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
     restart: always
   energysmart-proxy:
     build: ./energysmart-proxy
+    environment:
+      - PROXY_PASS_LOCATION=energysmart-bridge:8001
     ports:
       - "443:443"
     restart: always
diff --git a/energysmart-proxy/Dockerfile b/energysmart-proxy/Dockerfile
index 615a4eb..c5cbea3 100644
--- a/energysmart-proxy/Dockerfile
+++ b/energysmart-proxy/Dockerfile
@@ -2,10 +2,10 @@ FROM nginx:1.24
 
 RUN apt-get update && apt-get install -y openssl
 
-COPY nginx.conf /etc/nginx/
+COPY nginx.conf.template .
 
 RUN openssl req  -nodes -new -x509 -sha1 -subj '/CN=energysmartwaterheater.com' -keyout /etc/nginx/energysmartwaterheater.com.key -out /etc/nginx/energysmartwaterheater.com.crt -days 3650
 
 EXPOSE 443/tcp
 
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["/bin/sh" , "-c" , "envsubst < /nginx.conf.template > /etc/nginx/nginx.conf && exec nginx -g 'daemon off;'"]
diff --git a/energysmart-proxy/nginx.conf b/energysmart-proxy/nginx.conf.template
similarity index 96%
rename from energysmart-proxy/nginx.conf
rename to energysmart-proxy/nginx.conf.template
index 64691bf..25fc9fa 100644
--- a/energysmart-proxy/nginx.conf
+++ b/energysmart-proxy/nginx.conf.template
@@ -18,7 +18,6 @@ stream {
     server {
         listen                443 ssl;
         proxy_pass            192.168.0.241:8001;
-        resolver 192.168.0.1;
 
         ssl_certificate       /etc/nginx/energysmartwaterheater.com.crt;
         ssl_certificate_key   /etc/nginx/energysmartwaterheater.com.key;