From 253efc631f78d2c2537f4bf7769d48168ae05292 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Fri, 14 Oct 2016 11:27:59 +0200 Subject: [PATCH 1/2] Update heap default to include unit and drop wrapper.conf This [PR](https://github.com/neo4j/neo4j/pull/8138) enables the use of units in heap config. `neo4j-wrapper.conf` is deprecated so no reason to use it. --- src/3.1/docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/3.1/docker-entrypoint.sh b/src/3.1/docker-entrypoint.sh index 252ea9c3..64d74fdb 100755 --- a/src/3.1/docker-entrypoint.sh +++ b/src/3.1/docker-entrypoint.sh @@ -23,9 +23,9 @@ setting() { if [ "$1" == "neo4j" ]; then setting "dbms.tx_log.rotation.retention_policy" "${NEO4J_dbms_txLog_rotation_retentionPolicy:-100M size}" setting "dbms.memory.pagecache.size" "${NEO4J_dbms_memory_pagecache_size:-512M}" - setting "wrapper.java.additional=-Dneo4j.ext.udc.source" "${NEO4J_UDC_SOURCE:-docker}" neo4j-wrapper.conf - setting "dbms.memory.heap.initial_size" "${NEO4J_dbms_memory_heap_maxSize:-512}" neo4j-wrapper.conf - setting "dbms.memory.heap.max_size" "${NEO4J_dbms_memory_heap_maxSize:-512}" neo4j-wrapper.conf + setting "wrapper.java.additional=-Dneo4j.ext.udc.source" "${NEO4J_UDC_SOURCE:-docker}" + setting "dbms.memory.heap.initial_size" "${NEO4J_dbms_memory_heap_maxSize:-512M}" + setting "dbms.memory.heap.max_size" "${NEO4J_dbms_memory_heap_maxSize:-512M}" setting "dbms.unmanaged_extension_classes" "${NEO4J_dbms_unmanagedExtensionClasses:-}" setting "dbms.allow_format_migration" "${NEO4J_dbms_allowFormatMigration:-}" From 4d9c6859841c25030ad8bdae040da5686942b466 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Fri, 14 Oct 2016 11:44:37 +0200 Subject: [PATCH 2/2] Simplify setting function There is only one config file we care about now --- src/3.1/docker-entrypoint.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/3.1/docker-entrypoint.sh b/src/3.1/docker-entrypoint.sh index 64d74fdb..f837a739 100755 --- a/src/3.1/docker-entrypoint.sh +++ b/src/3.1/docker-entrypoint.sh @@ -3,13 +3,7 @@ setting() { setting="${1}" value="${2}" - file="${3:-neo4j.conf}" - - if [ ! -f "conf/${file}" ]; then - if [ -f "conf/neo4j.conf" ]; then - file="neo4j.conf" - fi - fi + file="neo4j.conf" if [ -n "${value}" ]; then if grep -q -F "${setting}=" conf/"${file}"; then