diff --git a/nifi/README.md b/nifi/README.md index fc00026..9882da3 100644 --- a/nifi/README.md +++ b/nifi/README.md @@ -9,14 +9,29 @@ and distribute data. ## up and running ```bash -$ mkdir -p data/nifi/{conf/archive,database_repository,flowfile_repository,content_repository,provenance_repository,state,logs} +$ mkdir -p data/nifi/{conf,database_repository,flowfile_repository,content_repository,provenance_repository,state,logs} $ mkdir -p data/registry/{database,flow_storage,logs} $ chown -R 1000:1000 data + +$ vi docker-compose.yml + volumes: + - ./data/nifi/conf:/tmp + # ./data/nifi/conf:/opt/nifi/nifi-current/conf + +$ docker-compose run --rm --entrypoint bash nifi +>>> cp /opt/nifi/nifi-current/conf/* /tmp +>>> exit + +$ vi docker-compose.yml + volumes: + # ./data/nifi/conf:/tmp + - ./data/nifi/conf:/opt/nifi/nifi-current/conf + $ docker-compose up -d $ curl http://127.0.0.1:8080/nifi/ $ curl http://127.0.0.1:18080/nifi-registry/ ``` -> :warning: upgrade seems very hard +> I copied config files from a temporary container. Maybe there are better ways. [1]: https://nifi.apache.org diff --git a/nifi/docker-compose-cluster.yml b/nifi/docker-compose-cluster.yml index 1683654..4dda802 100644 --- a/nifi/docker-compose-cluster.yml +++ b/nifi/docker-compose-cluster.yml @@ -1,7 +1,7 @@ version: "3.8" services: nifi: - image: apache/nifi:1.15.0 + image: apache/nifi:1.15.1 ports: - "8080:8080" - "8082:8082" diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml index 9e4dfc3..d372c84 100644 --- a/nifi/docker-compose.yml +++ b/nifi/docker-compose.yml @@ -3,11 +3,11 @@ version: "3.8" services: nifi: - image: apache/nifi:1.15.0 + image: apache/nifi:1.15.1 ports: - "8080:8080" volumes: - # ./data/nifi/conf:/tmp # docker-compose run --rm --entrypoint bash nifi + # ./data/nifi/conf:/tmp - ./data/nifi/conf:/opt/nifi/nifi-current/conf - ./data/nifi/database_repository:/opt/nifi/nifi-current/database_repository - ./data/nifi/flowfile_repository:/opt/nifi/nifi-current/flowfile_repository @@ -25,7 +25,7 @@ services: restart: unless-stopped registry: - image: apache/nifi-registry:1.15.0 + image: apache/nifi-registry:1.15.1 ports: - "18080:18080" volumes: diff --git a/nifi/nginx.conf b/nifi/nginx.conf index 1516bc4..42ea32b 100644 --- a/nifi/nginx.conf +++ b/nifi/nginx.conf @@ -12,10 +12,21 @@ server { ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers HIGH:!aNULL:!MD5; location / { + if ($request_uri ~* "\/\/") { + rewrite ^/(.*) $scheme://$host/$1 permanent; # FIXME: squeeze forward slash + } proxy_set_header X-ProxyScheme https; proxy_set_header X-ProxyHost $host; proxy_set_header X-ProxyPort 443; proxy_set_header X-ProxyContextPath /; proxy_pass http://127.0.0.1:8080; } + location /nifi-registry { + proxy_set_header Origin http://172.16.1.9:18080; + proxy_set_header X-ProxyScheme https; + proxy_set_header X-ProxyHost $host; + proxy_set_header X-ProxyPort 443; + proxy_set_header X-ProxyContextPath /; + proxy_pass http://127.0.0.1:18080; + } }