This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch support/nifi-1.11.x in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.11.x by this push: new e62841f NIFI-7080 e62841f is described below commit e62841f6432d618ba9e07d111a9d4a7cdebde9a2 Author: Aldrin Piri <ald...@apache.org> AuthorDate: Thu Jan 30 14:46:16 2020 -0500 NIFI-7080 * Ensure script files in Docker builds are treated as executable. * Updating git permissions to reflect executable for both secure.sh scripts. Signed-off-by: Aldrin Piri <ald...@apache.org> Signed-off-by: Kevin Doran <kdo...@apache.org> This closes #4027. Signed-off-by: Kevin Doran <kdo...@apache.org> --- nifi-docker/dockerhub/Dockerfile | 1 + nifi-docker/dockerhub/sh/secure.sh | 0 nifi-docker/dockermaven/Dockerfile | 1 + nifi-docker/dockermaven/sh/secure.sh | 0 4 files changed, 2 insertions(+) diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile index 60aad2c..373389a 100644 --- a/nifi-docker/dockerhub/Dockerfile +++ b/nifi-docker/dockerhub/Dockerfile @@ -36,6 +36,7 @@ ENV NIFI_PID_DIR=${NIFI_HOME}/run ENV NIFI_LOG_DIR=${NIFI_HOME}/logs ADD sh/ ${NIFI_BASE_DIR}/scripts/ +RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh # Setup NiFi user and create necessary directories RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent group ${GID} | cut -d: -f1` \ diff --git a/nifi-docker/dockerhub/sh/secure.sh b/nifi-docker/dockerhub/sh/secure.sh old mode 100644 new mode 100755 diff --git a/nifi-docker/dockermaven/Dockerfile b/nifi-docker/dockermaven/Dockerfile index cb73c74..36262e9 100644 --- a/nifi-docker/dockermaven/Dockerfile +++ b/nifi-docker/dockermaven/Dockerfile @@ -30,6 +30,7 @@ ENV NIFI_PID_DIR=${NIFI_HOME}/run ENV NIFI_LOG_DIR=${NIFI_HOME}/logs ADD sh/ ${NIFI_BASE_DIR}/scripts/ +RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh COPY $NIFI_BINARY $NIFI_BASE_DIR RUN unzip ${NIFI_BASE_DIR}/nifi-${NIFI_VERSION}-bin.zip -d ${NIFI_BASE_DIR} \ diff --git a/nifi-docker/dockermaven/sh/secure.sh b/nifi-docker/dockermaven/sh/secure.sh old mode 100644 new mode 100755