Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6067 Enabled support for the JVM remote debugger in the Docker container. 

This closes #3326.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
This commit is contained in:
Mike Thomsen 2019-02-21 20:39:16 -05:00 committed by Aldrin Piri
parent 922da68a23
commit 6d4504d662
No known key found for this signature in database
GPG Key ID: 531AEBAA4CFE5D00
7 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-docker/dockerhub/Dockerfile
View File

@ -82,7 +82,7 @@ VOLUME ${NIFI_LOG_DIR} \
RUN echo "#!/bin/sh\n" > $NIFI_HOME/bin/nifi-env.sh
# Web HTTP(s) & Socket Site-to-Site Ports
EXPOSE 8080 8443 10000
EXPOSE 8080 8443 10000 8000
WORKDIR ${NIFI_HOME}

2
nifi-docker/dockerhub/README.md
View File

@ -188,11 +188,13 @@ can be published to the host.
| HTTP Port | nifi.web.http.port | 8080 |
| HTTPS Port | nifi.web.https.port | 8443 |
| Remote Input Socket Port | nifi.remote.input.socket.port | 10000 |
| JVM Debugger | java.arg.debug | 8000 |
The Variable Registry can be configured for the docker image using the `NIFI_VARIABLE_REGISTRY_PROPERTIES` environment variable.
The JVM Memory initial and maximum heap size can be set using the `NIFI_JVM_HEAP_INIT` and `NIFI_JVM_HEAP_MAX` environment variables. These use values acceptable to the JVM `Xmx` and `Xms` parameters such as `1g` or `512m`.
The JVM Debugger can be enabled by setting the environment variable NIFI_JVM_DEBUGGER to any value.
=======
**NOTE**: If NiFi is proxied at context paths other than the root path of the proxy, the paths need to be set in the

6
nifi-docker/dockerhub/sh/common.sh
View File

@ -23,6 +23,12 @@ prop_replace () {
sed -i -e "s|^$1=.*$|$1=$2|" ${target_file}
}
uncomment() {
target_file=${2}
echo "Uncommenting ${target_file}"
sed -i -e "s|^\#$1|$1|" ${target_file}
}
# NIFI_HOME is defined by an ENV command in the backing Dockerfile
export nifi_bootstrap_file=${NIFI_HOME}/conf/bootstrap.conf
export nifi_props_file=${NIFI_HOME}/conf/nifi.properties

4
nifi-docker/dockerhub/sh/start.sh
View File

@ -28,6 +28,10 @@ if [ ! -z "${NIFI_JVM_HEAP_MAX}" ]; then
prop_replace 'java.arg.3' "-Xmx${NIFI_JVM_HEAP_MAX}" ${nifi_bootstrap_file}
fi
if [ ! -z "${NIFI_JVM_DEBUGGER}" ]; then
uncomment "java.arg.debug" ${nifi_bootstrap_file}
fi
# Establish baseline properties
prop_replace 'nifi.web.http.port' "${NIFI_WEB_HTTP_PORT:-8080}"
prop_replace 'nifi.web.http.host' "${NIFI_WEB_HTTP_HOST:-$HOSTNAME}"

2
nifi-docker/dockermaven/Dockerfile
View File

@ -86,7 +86,7 @@ USER nifi
RUN echo "#!/bin/sh\n" > $NIFI_HOME/bin/nifi-env.sh
# Web HTTP(s) & Socket Site-to-Site Ports
EXPOSE 8080 8443 10000
EXPOSE 8080 8443 10000 8000
WORKDIR ${NIFI_HOME}

6
nifi-docker/dockermaven/sh/common.sh
View File

@ -23,6 +23,12 @@ prop_replace () {
sed -i -e "s|^$1=.*$|$1=$2|" ${target_file}
}
uncomment() {
target_file=${2}
echo "Uncommenting ${target_file}"
sed -i -e "s|^\#$1|$1|" ${target_file}
}
# NIFI_HOME is defined by an ENV command in the backing Dockerfile
export nifi_bootstrap_file=${NIFI_HOME}/conf/bootstrap.conf
export nifi_props_file=${NIFI_HOME}/conf/nifi.properties

4
nifi-docker/dockermaven/sh/start.sh
View File

@ -28,6 +28,10 @@ if [ ! -z "${NIFI_JVM_HEAP_MAX}" ]; then
prop_replace 'java.arg.3' "-Xmx${NIFI_JVM_HEAP_MAX}" ${nifi_bootstrap_file}
fi
if [ ! -z "${NIFI_JVM_DEBUGGER}" ]; then
uncomment "java.arg.debug" ${nifi_bootstrap_file}
fi
# Establish baseline properties
prop_replace 'nifi.web.http.port' "${NIFI_WEB_HTTP_PORT:-8080}"
prop_replace 'nifi.web.http.host' "${NIFI_WEB_HTTP_HOST:-$HOSTNAME}"