You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/06/29 16:39:37 UTC
nifi-registry git commit: NIFIREG-180 Added db configuration
properties to the docker image.
Repository: nifi-registry
Updated Branches:
refs/heads/master 6abbfe1c6 -> 59348b5aa
NIFIREG-180 Added db configuration properties to the docker image.
This closes #128.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/59348b5a
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/59348b5a
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/59348b5a
Branch: refs/heads/master
Commit: 59348b5aa7c69c1d35e6b50e56183372b1b86220
Parents: 6abbfe1
Author: Mike <mi...@gmail.com>
Authored: Fri Jun 29 09:51:10 2018 -0400
Committer: Aldrin Piri <al...@gmail.com>
Committed: Fri Jun 29 12:39:05 2018 -0400
----------------------------------------------------------------------
nifi-registry-docker/dockerhub/README.md | 12 ++++++++++
nifi-registry-docker/dockerhub/sh/start.sh | 2 ++
.../dockerhub/sh/update_database.sh | 24 ++++++++++++++++++++
3 files changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/59348b5a/nifi-registry-docker/dockerhub/README.md
----------------------------------------------------------------------
diff --git a/nifi-registry-docker/dockerhub/README.md b/nifi-registry-docker/dockerhub/README.md
index e4f7823..860c6dc 100644
--- a/nifi-registry-docker/dockerhub/README.md
+++ b/nifi-registry-docker/dockerhub/README.md
@@ -123,3 +123,15 @@ volume to provide certificates on the host system to the container instance.
-e LDAP_TLS_TRUSTSTORE: ''
-e LDAP_TLS_TRUSTSTORE_PASSWORD: ''
-e LDAP_TLS_TRUSTSTORE_TYPE: ''
+
+### The following, optional environment variables can be used to configure the database
+
+| nifi-registry.properties entry | Variable |
+|----------------------------------------|----------------------------|
+| nifi.registry.db.url | NIFI_REGISTRY_DB_URL |
+| nifi.registry.db.driver.class | NIFI_REGISTRY_DB_CLASS |
+| nifi.registry.db.driver.directory | NIFI_REGISTRY_DB_DIR |
+| nifi.registry.db.driver.username | NIFI_REGISTRY_DB_USER |
+| nifi.registry.db.driver.password | NIFI_REGISTRY_DB_PASS |
+| nifi.registry.db.driver.maxConnections | NIFI_REGISTRY_DB_MAX_CONNS |
+| nifi.registry.db.sql.debug | NIFI_REGISTRY_DB_DEBUG_SQL |
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/59348b5a/nifi-registry-docker/dockerhub/sh/start.sh
----------------------------------------------------------------------
diff --git a/nifi-registry-docker/dockerhub/sh/start.sh b/nifi-registry-docker/dockerhub/sh/start.sh
index 618d229..0d725ad 100755
--- a/nifi-registry-docker/dockerhub/sh/start.sh
+++ b/nifi-registry-docker/dockerhub/sh/start.sh
@@ -23,6 +23,8 @@ scripts_dir='/opt/nifi-registry/scripts'
prop_replace 'nifi.registry.web.http.port' "${NIFI_REGISTRY_WEB_HTTP_PORT:-18080}"
prop_replace 'nifi.registry.web.http.host' "${NIFI_REGISTRY_WEB_HTTP_HOST:-$HOSTNAME}"
+. ${scripts_dir}/update_database.sh
+
# Check if we are secured or unsecured
case ${AUTH} in
tls)
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/59348b5a/nifi-registry-docker/dockerhub/sh/update_database.sh
----------------------------------------------------------------------
diff --git a/nifi-registry-docker/dockerhub/sh/update_database.sh b/nifi-registry-docker/dockerhub/sh/update_database.sh
new file mode 100644
index 0000000..c1c3c6f
--- /dev/null
+++ b/nifi-registry-docker/dockerhub/sh/update_database.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prop_replace 'nifi.registry.db.url' "${NIFI_REGISTRY_DB_URL:-jdbc:h2:./database/nifi-registry-primary;AUTOCOMMIT=OFF;DB_CLOSE_ON_EXIT=FALSE;LOCK_MODE=3;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE}"
+prop_replace 'nifi.registry.db.driver.class' "${NIFI_REGISTRY_DB_CLASS:-org.h2.Driver}"
+prop_replace 'nifi.registry.db.driver.directory' "${NIFI_REGISTRY_DB_DIR:-}"
+prop_replace 'nifi.registry.db.driver.username' "${NIFI_REGISTRY_DB_USER:-nifireg}"
+prop_replace 'nifi.registry.db.driver.password' "${NIFI_REGISTRY_DB_PASS:-nifireg}"
+prop_replace 'nifi.registry.db.driver.maxConnections' "${NIFI_REGISTRY_DB_MAX_CONNS:-5}"
+prop_replace 'nifi.registry.db.sql.debug' "${NIFI_REGISTRY_DB_DEBUG_SQL:-false}"
\ No newline at end of file