Make OPENSEARCH_DASHBOARDS_HOME args works correctly in dashboards dockerfile

Signed-off-by: leedonggyu <[email protected]>

Author: donggyu04

docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-1.x.sh

@@ -15,9 +15,6 @@
 #
 #       --opensearch.startupTimeout=60
 
-# Setup Home Directory
-export OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
-
 opensearch_dashboards_vars=(
     console.enabled
     console.proxyConfig
@@ -176,7 +173,7 @@ function setupSecurityDashboardsPlugin {
 function runOpensearchDashboards {
     longopts=()
     for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
-        # 'opensearch.hosts' -> 'OPENSEARCH_URL'
+        # 'opensearch.hosts' -> 'OPENSEARCH_HOSTS'
         env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
 
         # Indirectly lookup env var values via the name of the var.

docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh

@@ -15,9 +15,6 @@
 #
 #       --opensearch.startupTimeout=60
 
-# Setup Home Directory
-export OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
-
 opensearch_dashboards_vars=(
     console.enabled
     console.proxyConfig
@@ -188,7 +185,7 @@ function setupSecurityDashboardsPlugin {
 function runOpensearchDashboards {
     longopts=()
     for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
-        # 'opensearch.hosts' -> 'OPENSEARCH_URL'
+        # 'opensearch.hosts' -> 'OPENSEARCH_HOSTS'
         env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
 
         # Indirectly lookup env var values via the name of the var.

docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh

@@ -15,9 +15,6 @@
 #
 #       --opensearch.startupTimeout=60
 
-# Setup Home Directory
-export OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
-
 opensearch_dashboards_vars=(
     console.enabled
     console.proxyConfig
@@ -188,7 +185,7 @@ function setupSecurityDashboardsPlugin {
 function runOpensearchDashboards {
     longopts=()
     for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
-        # 'opensearch.hosts' -> 'OPENSEARCH_URL'
+        # 'opensearch.hosts' -> 'OPENSEARCH_HOSTS'
         env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
 
         # Indirectly lookup env var values via the name of the var.

docker/release/dockerfiles/opensearch-dashboards.al2.dockerfile

@@ -72,6 +72,7 @@ WORKDIR $OPENSEARCH_DASHBOARDS_HOME
 
 # Set PATH
 ENV PATH=$PATH:$OPENSEARCH_DASHBOARDS_HOME/bin
+ENV OPENSEARCH_DASHBOARDS_HOME=$OPENSEARCH_DASHBOARDS_HOME
 
 # Change user
 USER $UID

docker/release/dockerfiles/opensearch-dashboards.al2023.dockerfile

@@ -73,6 +73,7 @@ WORKDIR $OPENSEARCH_DASHBOARDS_HOME
 
 # Set PATH
 ENV PATH=$PATH:$OPENSEARCH_DASHBOARDS_HOME/bin
+ENV OPENSEARCH_DASHBOARDS_HOME=$OPENSEARCH_DASHBOARDS_HOME
 
 # Change user
 USER $UID