You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/07/03 09:42:45 UTC
nifi git commit: NIFI-5359 Exposed variable registry to docker image.
Repository: nifi
Updated Branches:
refs/heads/master ee86af0c1 -> df4931280
NIFI-5359 Exposed variable registry to docker image.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2829.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/df493128
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/df493128
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/df493128
Branch: refs/heads/master
Commit: df4931280496dd1540317e4fb392755426690263
Parents: ee86af0
Author: Mike Thomsen <mi...@gmail.com>
Authored: Mon Jul 2 05:57:59 2018 -0400
Committer: Pierre Villard <pi...@gmail.com>
Committed: Tue Jul 3 11:42:35 2018 +0200
----------------------------------------------------------------------
nifi-docker/dockerhub/README.md | 2 ++
nifi-docker/dockerhub/sh/start.sh | 2 ++
nifi-docker/dockermaven/sh/start.sh | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/df493128/nifi-docker/dockerhub/README.md
----------------------------------------------------------------------
diff --git a/nifi-docker/dockerhub/README.md b/nifi-docker/dockerhub/README.md
index 31e808e..3a4cd74 100644
--- a/nifi-docker/dockerhub/README.md
+++ b/nifi-docker/dockerhub/README.md
@@ -134,6 +134,8 @@ can be published to the host.
| HTTPS Port | nifi.web.https.port | 8443 |
| Remote Input Socket Port | nifi.remote.input.socket.port | 10000 |
+The Variable Registry can be configured for the docker image using the `NIFI_VARIABLE_REGISTRY_PROPERTIES` environment variable.
+
=======
**NOTE**: If mapping the HTTPS port specifying trusted hosts should be provided for the property _nifi.web.proxy.host_. This property can be specified to running instances
via specifying an environment variable at container instantiation of _NIFI\_WEB\_PROXY\_HOST_.
http://git-wip-us.apache.org/repos/asf/nifi/blob/df493128/nifi-docker/dockerhub/sh/start.sh
----------------------------------------------------------------------
diff --git a/nifi-docker/dockerhub/sh/start.sh b/nifi-docker/dockerhub/sh/start.sh
index 2775bc7..d43f3a1 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -26,6 +26,8 @@ prop_replace 'nifi.remote.input.host' "${NIFI_REMOTE_INPUT_HOST:-$HOST
prop_replace 'nifi.remote.input.socket.port' "${NIFI_REMOTE_INPUT_SOCKET_PORT:-10000}"
prop_replace 'nifi.remote.input.secure' 'false'
+prop_replace 'nifi.variable.registry.properties' "${NIFI_VARIABLE_REGISTRY_PROPERTIES:-}"
+
# Check if we are secured or unsecured
case ${AUTH} in
tls)
http://git-wip-us.apache.org/repos/asf/nifi/blob/df493128/nifi-docker/dockermaven/sh/start.sh
----------------------------------------------------------------------
diff --git a/nifi-docker/dockermaven/sh/start.sh b/nifi-docker/dockermaven/sh/start.sh
index 2775bc7..d43f3a1 100755
--- a/nifi-docker/dockermaven/sh/start.sh
+++ b/nifi-docker/dockermaven/sh/start.sh
@@ -26,6 +26,8 @@ prop_replace 'nifi.remote.input.host' "${NIFI_REMOTE_INPUT_HOST:-$HOST
prop_replace 'nifi.remote.input.socket.port' "${NIFI_REMOTE_INPUT_SOCKET_PORT:-10000}"
prop_replace 'nifi.remote.input.secure' 'false'
+prop_replace 'nifi.variable.registry.properties' "${NIFI_VARIABLE_REGISTRY_PROPERTIES:-}"
+
# Check if we are secured or unsecured
case ${AUTH} in
tls)