Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed jvm.additional overriden by docker-entrypoint #205

Merged
merged 4 commits into from
Nov 25, 2019

Conversation

bfeshti
Copy link
Contributor

@bfeshti bfeshti commented Nov 15, 2019

  • Fixed the issue where the custom values set by users for dbms.jvm.additional were being overriden by docker-entrypoint.sh.
  • Added a small test for it.

Copy link
Member

@jennyowen jennyowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, and if the tests pass I approve.
I do wonder if we have the same problem with NEO4J_wrapper_java_additional?

@bfeshti
Copy link
Contributor Author

bfeshti commented Nov 15, 2019

I think we have the same problem with it also,I will fix it. Thanks.

@bfeshti
Copy link
Contributor Author

bfeshti commented Nov 25, 2019

Found a new more reliable way to fix it that also includes the NEO4J_wrapper_java_additional

Copy link
Member

@jennyowen jennyowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall this looks good! I only have a minor edit request.

@@ -368,6 +365,16 @@ for conf in ${!ENTERPRISE[@]} ; do
fi
done

if grep -q "udc.source=tarball" "${NEO4J_HOME}"/conf/neo4j.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment applies to all entrypoints.
I've a couple of notes about making this easier for us to maintain.

  1. In general if you're doing something in your which looks crazy, it's a good idea to leave a comment as to why you're doing it that way instead of another way. This is because when you come back to your code in 6 months time, you don't waste a load of time wondering whyyyy you did this crazy looking thing (and usually reaching the same conclusion you did originally). What I'm saying is write a comment here about why you're using sed/grep to edit the conf :)

  2. Could you make the indentation consistent? It's easier to read that way, and extra indentation makes me worry that some code got deleted around this.

Copy link
Member

@jennyowen jennyowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great!

@bfeshti bfeshti merged commit bc476cb into master Nov 25, 2019
@bfeshti bfeshti deleted the fix-jvm.additional-not-overriden branch November 25, 2019 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants