Run docker under current user

neo4j-drivers · Jun 25, 2019 · 769bff1 · 769bff1
1 parent f815eaa
commit 769bff1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/boltkit/__main__.py b/boltkit/__main__.py
@@ -269,6 +269,8 @@ def handle_input(value, neo4j):
                    "Both of the folder paths should be absolute paths. "
                    "When starting a cluster, sub-folders for each cluster are expected. "
                    "Otherwise new sub-folders will be auto-created inside the given host folder.")
+@click.option("--user", type=int,
+              help="Specify the user to run Neo4j docker container.")
 @click.option("--env", multiple=True,
               help="Extra environment variables to the neo4j docker container. "
                    "Use this to pass customized configurations to neo4j. "

diff --git a/boltkit/server/__init__.py b/boltkit/server/__init__.py
@@ -22,7 +22,7 @@
 from itertools import chain
 from logging import getLogger
 from math import ceil
-from os import getenv, path
+from os import getenv, path, makedirs
 from threading import Thread
 from uuid import uuid4
 from xml.etree import ElementTree
@@ -44,7 +44,9 @@
                 "dbms.memory.heap.initial_size": "300m",
                 "dbms.memory.heap.max_size": "500m",
                 "dbms.transaction.bookmark_ready_timeout": "5s",
-                "dbms.backup.enabled": "false"}
+                "dbms.backup.enabled": "false",
+                "dbms.connectors.default_listen_address": "::",
+                }
 
 DEFAULT_WAIT_TIMEOUT = 120  # 2 mins
 
@@ -59,7 +61,7 @@ class Neo4jMachine:
 
     ready = 0
 
-    def __init__(self, name, service_name, image, auth, bolt_port, http_port, volume, env, **config):
+    def __init__(self, name, service_name, image, auth, bolt_port, http_port, volume, env, user, **config):
         self.name = name
         self.service_name = service_name
         self.fq_name = "{}.{}".format(self.name, self.service_name)
@@ -91,6 +93,8 @@ def __init__(self, name, service_name, image, auth, bolt_port, http_port, volume
         volumes = {}
         for s in volume:
             source, target = s.split(":")
+            # ensure host directory already exists before starting docker
+            makedirs(source, exist_ok=True)
             volumes[source] = {'bind': target, 'mode': 'rw'}
 
         def create_container(img):
@@ -101,7 +105,8 @@ def create_container(img):
                                                  name=self.fq_name,
                                                  network=self.service_name,
                                                  ports=ports,
-                                                 volumes=volumes)
+                                                 volumes=volumes,
+                                                 user=user)
 
         try:
             self.container = create_container(self.image)
@@ -340,7 +345,7 @@ def find_and_stop(cls, service_name):
 class Neo4jStandaloneService(Neo4jService):
     default_image = "neo4j:latest"
 
-    def __init__(self, name=None, bolt_port=None, http_port=None, volume=None, env=None, **parameters):
+    def __init__(self, name=None, bolt_port=None, http_port=None, volume=None, env=None, user=None, **parameters):
         super().__init__(name, **parameters)
         machine = Neo4jMachine(
             "z",
@@ -351,6 +356,7 @@ def __init__(self, name=None, bolt_port=None, http_port=None, volume=None, env=N
             http_port=http_port or self.default_http_port,
             volume=volume or {},
             env=env or {},
+            user=user,
         )
         self.routers[machine.fq_name] = machine
         self.machines.append(machine)
@@ -375,7 +381,7 @@ def _port_range(cls, base_port, count):
         return range(base_port, base_port + count)
 
     def __init__(self, name=None, bolt_port=None, http_port=None, n_cores=None, n_replicas=None, volume=None, env=None,
-                 **parameters):
+                 user=None, **parameters):
         super().__init__(name, n_cores=n_cores, n_replicas=n_replicas, **parameters)
         if not "enterprise" in self.image:
             raise ValueError("Enterprise neo4j docker image is required for cluster")
@@ -411,6 +417,7 @@ def __init__(self, name=None, bolt_port=None, http_port=None, n_cores=None, n_re
                 http_port=core_http_port_range[i],
                 volume=["{}:{}".format(path.join(s.split(":")[0], core_names[i]), s.split(":")[1]) for s in volume],
                 env=env,
+                user=user,
                 **{
                     "causal_clustering.initial_discovery_members": ",".join(core_addresses),
                     "causal_clustering.minimum_core_cluster_size_at_formation": self.n_cores,
@@ -441,6 +448,7 @@ def __init__(self, name=None, bolt_port=None, http_port=None, n_cores=None, n_re
                 http_port=replica_http_port_range[i],
                 volume=["{}:{}".format(path.join(s.split(":")[0], replica_names[i]), s.split(":")[1]) for s in volume],
                 env=env,
+                user=user,
                 **{
                     "causal_clustering.initial_discovery_members": ",".join(core_addresses),
                     "dbms.connector.bolt.advertised_address": "localhost:{}".format(replica_bolt_port_range[i]),