[nifi] 02/02: NIFI-7021 wrap up post nifi 1.11.0 release

[jo...@apache.org]

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

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

commit 379c3fbe5110df02d7278a4ff27f4cefafdb6b1c
Author: Joe Witt <jo...@apache.org>
AuthorDate: Wed Jan 22 22:09:29 2020 -0500

    NIFI-7021 wrap up post nifi 1.11.0 release
---
 nifi-docker/docker-compose/docker-compose.yml | 2 +-
 nifi-docker/dockerhub/DockerImage.txt         | 2 +-
 nifi-docker/dockerhub/Dockerfile              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nifi-docker/docker-compose/docker-compose.yml b/nifi-docker/docker-compose/docker-compose.yml
index 60a016c..42e1006 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.10.0-SNAPSHOT-dockermaven
+    image: apache/nifi:1.12.0-SNAPSHOT-dockermaven
     ports:
       - 8080 # Unsecured HTTP Web Port
     environment:
diff --git a/nifi-docker/dockerhub/DockerImage.txt b/nifi-docker/dockerhub/DockerImage.txt
index 2b40237..dc7758d 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.11.0
+apache/nifi:1.12.0
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index 60aad2c..9cfdb16 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.11.0
+ARG NIFI_VERSION=1.12.0
 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}