Browse Source

HUE-9020 [core] Improve Hue and Hue Load Balancer docker image generation.

Change-Id: Id524637e1db55a1be9fa1edf9a4b1f107af2bfde
Prakash Ranade 6 years ago
parent
commit
ad771efe56
3 changed files with 3 additions and 2 deletions
  1. 2 0
      tools/container/build.sh
  2. 1 1
      tools/container/hue/Dockerfile
  3. 0 1
      tools/container/huelb/Dockerfile

+ 2 - 0
tools/container/build.sh

@@ -65,6 +65,7 @@ docker_hue_build() {
     --build-arg GBRANCH=$GBRANCH \
     --build-arg GBRANCH=$GBRANCH \
     --build-arg VERSION=$VERSION \
     --build-arg VERSION=$VERSION \
     --build-arg HUEUSER=$HUEUSER \
     --build-arg HUEUSER=$HUEUSER \
+    --build-arg HUE_CONF=$HUE_CONF \
     .
     .
 }
 }
 
 
@@ -88,6 +89,7 @@ docker_huelb_build() {
     --build-arg GBRANCH=$GBRANCH \
     --build-arg GBRANCH=$GBRANCH \
     --build-arg VERSION=$VERSION \
     --build-arg VERSION=$VERSION \
     --build-arg HUEUSER=$HUEUSER \
     --build-arg HUEUSER=$HUEUSER \
+    --build-arg HUE_CONF=$HUE_CONF \
     .
     .
 }
 }
 
 

+ 1 - 1
tools/container/hue/Dockerfile

@@ -7,11 +7,11 @@ ARG GSHA
 ARG GBRANCH
 ARG GBRANCH
 ARG VERSION
 ARG VERSION
 ARG HUEUSER
 ARG HUEUSER
+ARG HUE_CONF
 
 
 # Set the environment variable
 # Set the environment variable
 ENV NAME="hue" \
 ENV NAME="hue" \
     HUE_USER=${HUEUSER} \
     HUE_USER=${HUEUSER} \
-    HUE_CONF="/etc/hue" \
     HUE_HOME="/opt/${HUEUSER}" \
     HUE_HOME="/opt/${HUEUSER}" \
     HUE_CONF_DIR="${HUE_CONF}/conf" \
     HUE_CONF_DIR="${HUE_CONF}/conf" \
     HUE_LOG_DIR="/var/log/${HUEUSER}" \
     HUE_LOG_DIR="/var/log/${HUEUSER}" \

+ 0 - 1
tools/container/huelb/Dockerfile

@@ -11,7 +11,6 @@ ARG HUEUSER
 # Set the environment variable
 # Set the environment variable
 ENV NAME="hue" \
 ENV NAME="hue" \
     HUE_USER=${HUEUSER} \
     HUE_USER=${HUEUSER} \
-    HUE_CONF="/etc/hue" \
     HUE_HOME="/opt/${HUEUSER}" \
     HUE_HOME="/opt/${HUEUSER}" \
     HUE_CONF_DIR="${HUE_CONF}/conf" \
     HUE_CONF_DIR="${HUE_CONF}/conf" \
     HUE_LOG_DIR="/var/log/${HUEUSER}" \
     HUE_LOG_DIR="/var/log/${HUEUSER}" \