[nifi] branch main updated: NIFI-6667 Added variable to accept nifi.sensitive.props.key in Dockerfiles

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 8641b54  NIFI-6667 Added variable to accept nifi.sensitive.props.key 
in Dockerfiles
8641b54 is described below

commit 8641b54a49d2215b870acc0f96203cbc7f61abe2
Author: Emilio Setiadarma <emiliosetiada...@gmail.com>
AuthorDate: Fri Jun 4 09:07:42 2021 -0700

    NIFI-6667 Added variable to accept nifi.sensitive.props.key in Dockerfiles
    
    This closes #5128
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 nifi-docker/dockerhub/sh/start.sh   | 2 ++
 nifi-docker/dockermaven/sh/start.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nifi-docker/dockerhub/sh/start.sh 
b/nifi-docker/dockerhub/sh/start.sh
index e4bc79a..a09b09b 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -63,6 +63,8 @@ prop_replace 'nifi.analytics.connection.model.implementation' 
  "${NIFI_ANALYTIC
 prop_replace 'nifi.analytics.connection.model.score.name'       
"${NIFI_ANALYTICS_MODEL_SCORE_NAME:-rSquared}"
 prop_replace 'nifi.analytics.connection.model.score.threshold'  
"${NIFI_ANALYTICS_MODEL_SCORE_THRESHOLD:-.90}"
 
+prop_replace 'nifi.sensitive.props.key'   "${NIFI_SENSITIVE_PROPS_KEY:-}"
+
 . "${scripts_dir}/update_cluster_state_management.sh"
 
 # Check if we are secured or unsecured
diff --git a/nifi-docker/dockermaven/sh/start.sh 
b/nifi-docker/dockermaven/sh/start.sh
index bd67c27..3dc5dfc 100755
--- a/nifi-docker/dockermaven/sh/start.sh
+++ b/nifi-docker/dockermaven/sh/start.sh
@@ -63,6 +63,8 @@ prop_replace 'nifi.analytics.connection.model.implementation' 
  "${NIFI_ANALYTIC
 prop_replace 'nifi.analytics.connection.model.score.name'       
"${NIFI_ANALYTICS_MODEL_SCORE_NAME:-rSquared}"
 prop_replace 'nifi.analytics.connection.model.score.threshold'  
"${NIFI_ANALYTICS_MODEL_SCORE_THRESHOLD:-.90}"
 
+prop_replace 'nifi.sensitive.props.key'   "${NIFI_SENSITIVE_PROPS_KEY:-}"
+
 . "${scripts_dir}/update_cluster_state_management.sh"
 
 # Check if we are secured or unsecured