From ee5fab27ab8049c05f797ffac39552a612e8740c Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 15 May 2020 16:42:47 +0800
Subject: [PATCH] update nifi

---
 nifi/README.md                  |  8 +++++---
 nifi/docker-compose.yml         | 28 ++++++++++++++++++++--------
 openmeetings/docker-compose.yml |  4 ++--
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/nifi/README.md b/nifi/README.md
index d40559f..d9bc534 100644
--- a/nifi/README.md
+++ b/nifi/README.md
@@ -10,10 +10,12 @@ and distribute data.
 ## up and running
 
 ```bash
-$ docker-compose up -d
+$ mkdir -p data/nifi/{conf/archive,database_repository,flowfile_repository,content_repository,provenance_repository,state,logs}
+$ mkdir -p data/registry/{database,flow_storage,logs}
 $ chown -R 1000:1000 data
-$ docker-compose restart
-$ curl http://127.0.0.1:8080
+$ docker-compose up -d
+$ curl http://127.0.0.1:8080/nifi/
+$ curl http://127.0.0.1:18080/nifi-registry/
 ```
 
 [1]: https://nifi.apache.org
diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml
index 9d38465..927b599 100644
--- a/nifi/docker-compose.yml
+++ b/nifi/docker-compose.yml
@@ -1,20 +1,32 @@
-version: "3.7"
+version: "3.8"
+
 services:
+
   nifi:
     image: apache/nifi:1.10.0
     ports:
       - "8080:8080"
     volumes:
-      - ./data/conf/archive:/opt/nifi/nifi-current/conf/archive
-      - ./data/database_repository:/opt/nifi/nifi-current/database_repository
-      - ./data/flowfile_repository:/opt/nifi/nifi-current/flowfile_repository
-      - ./data/content_repository:/opt/nifi/nifi-current/content_repository
-      - ./data/provenance_repository:/opt/nifi/nifi-current/provenance_repository
-      - ./data/state:/opt/nifi/nifi-current/state
-      - ./data/logs:/opt/nifi/nifi-current/logs
+      - ./data/nifi/conf/archive:/opt/nifi/nifi-current/conf/archive
+      - ./data/nifi/database_repository:/opt/nifi/nifi-current/database_repository
+      - ./data/nifi/flowfile_repository:/opt/nifi/nifi-current/flowfile_repository
+      - ./data/nifi/content_repository:/opt/nifi/nifi-current/content_repository
+      - ./data/nifi/provenance_repository:/opt/nifi/nifi-current/provenance_repository
+      - ./data/nifi/state:/opt/nifi/nifi-current/state
+      - ./data/nifi/logs:/opt/nifi/nifi-current/logs
     environment:
       - NIFI_WEB_HTTP_PORT=8080
       - NIFI_JVM_HEAP_INIT=8g
       - NIFI_JVM_HEAP_MAX=16g
     hostname: nifi
     restart: unless-stopped
+
+  registry:
+    image: apache/nifi-registry:0.6.0
+    ports:
+      - "18080:18080"
+    volumes:
+      - ./data/registry/database:/opt/nifi-registry/nifi-registry-current/database
+      - ./data/registry/flow_storage:/opt/nifi-registry/nifi-registry-current/flow_storage
+      - ./data/registry/logs:/opt/nifi-registry/nifi-registry-current/logs
+    restart: unless-stopped
diff --git a/openmeetings/docker-compose.yml b/openmeetings/docker-compose.yml
index d37fb56..37d1cf1 100644
--- a/openmeetings/docker-compose.yml
+++ b/openmeetings/docker-compose.yml
@@ -1,9 +1,9 @@
-version: '3.7'
+version: '3.8'
 
 services:
 
   openmeetings:
-    image: apache/openmeetings:min-5.0.0-M3
+    image: apache/openmeetings:min-5.0.0-M4
     ports:
       - "5080:5080"
     volumes: