[nifi] branch support/nifi-1.12.x updated: NIFI-7787

[jo...@apache.org]

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

joewitt pushed a commit to branch support/nifi-1.12.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.12.x by this push:
     new 1032f9e  NIFI-7787
1032f9e is described below

commit 1032f9e352a88f96f4362fa4b3be2c5ae5531ed0
Author: Joe Witt <jo...@apache.org>
AuthorDate: Mon Sep 28 10:27:48 2020 -0700

    NIFI-7787
---
 nifi-docker/docker-compose/docker-compose.yml | 4 ++--
 nifi-docker/dockerhub/DockerImage.txt         | 2 +-
 nifi-docker/dockerhub/Dockerfile              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nifi-docker/docker-compose/docker-compose.yml b/nifi-docker/docker-compose/docker-compose.yml
index a28afc3..2d6029c 100644
--- a/nifi-docker/docker-compose/docker-compose.yml
+++ b/nifi-docker/docker-compose/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
   nifi:
-    image: apache/nifi:1.12.1-dockermaven
+    image: apache/nifi:1.12.2-dockermaven
     ports:
       - 8080 # Unsecured HTTP Web Port
     environment:
@@ -30,4 +30,4 @@ services:
       - NIFI_CLUSTER_IS_NODE=true
       - NIFI_CLUSTER_NODE_PROTOCOL_PORT=8082
       - NIFI_ZK_CONNECT_STRING=zookeeper:2181
-      - NIFI_ELECTION_MAX_WAIT=1 min
\ No newline at end of file
+      - NIFI_ELECTION_MAX_WAIT=1 min
diff --git a/nifi-docker/dockerhub/DockerImage.txt b/nifi-docker/dockerhub/DockerImage.txt
index 5835f72..8f356a7 100644
--- a/nifi-docker/dockerhub/DockerImage.txt
+++ b/nifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi:1.12.1
+apache/nifi:1.12.2
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index 64a2a4a..dfc5e1f 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1000
 ARG GID=1000
-ARG NIFI_VERSION=1.12.1
+ARG NIFI_VERSION=1.12.2
 ARG BASE_URL=https://archive.apache.org/dist
 ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
 ARG NIFI_BINARY_PATH=${NIFI_BINARY_PATH:-/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-bin.zip}