feat: configure keria env with environment variables

README.md

@@ -67,10 +67,23 @@ All Agent db access is through the associated Agent.
     ```
 
 #### Run with docker
-* Specify an entrypoint with proper configuration, for instance if you want to use the demo-witness-oobis that is under the scripts/keri/cf dir:
-```
-ENTRYPOINT ["keria", "start",  "--config-file", "demo-witness-oobis", "--config-dir", "./scripts"]
+
+* The easiest way to configure a keria container is with environment variables. See below example for a working docker-compose configuration
+
+```yaml
+services:
+    keria:
+        image: weboftrust/keria:latest
+        environment:
+            KERI_AGENT_CORS: 1
+            KERIA_CURLS: http://<keria-hostname>:3902/
+            KERIA_IURLS: http://<witness-demo-hostname>:5642/oobi/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha;http://<witness-demo-hostname>:5643/oobi/BLskRTInXnMxWaGqcpSyMgo0nYbalW99cGZESrz3zapM
+        ports:
+            - 3901:3901
+            - 3902:3902
+            - 3903:3903
 ```
+
 You can see a [working example here](https://github.com/WebOfTrust/signify-ts/blob/main/docker-compose.yaml).
 
 ### Running Tests

images/keria.dockerfile

@@ -52,4 +52,6 @@ EXPOSE 3903
 
 COPY src/ src/
 
-ENTRYPOINT ["keria", "start",  "--config-file", "demo-witness-oobis", "--config-dir", "./scripts"]
+ENTRYPOINT ["keria"]
+
+CMD [ "start" ]

src/keria/app/agenting.py

@@ -53,10 +53,10 @@
 
 
 def setup(name, bran, adminPort, bootPort, base='', httpPort=None, configFile=None, configDir=None,
-          keypath=None, certpath=None, cafilepath=None, cors=False, releaseTimeout=None):
+          keypath=None, certpath=None, cafilepath=None, cors=False, releaseTimeout=None, curls=None, iurls=None, durls=None):
     """ Set up an ahab in Signify mode """
 
-    agency = Agency(name=name, base=base, bran=bran, configFile=configFile, configDir=configDir, releaseTimeout=releaseTimeout)
+    agency = Agency(name=name, base=base, bran=bran, configFile=configFile, configDir=configDir, releaseTimeout=releaseTimeout, curls=curls, iurls=iurls, durls=durls)
     bootApp = falcon.App(middleware=falcon.CORSMiddleware(
         allow_origins='*', allow_credentials='*',
         expose_headers=['cesr-attachment', 'cesr-date', 'content-type', 'signature', 'signature-input',
@@ -157,15 +157,19 @@ class Agency(doing.DoDoer):
 
     """
 
-    def __init__(self, name, bran, base="", releaseTimeout=None, configFile=None, configDir=None, adb=None, temp=False):
+    def __init__(self, name, bran, base="", releaseTimeout=None, configFile=None, configDir=None, adb=None, temp=False, curls=None, iurls=None, durls=None):
         self.name = name
         self.base = base
         self.bran = bran
         self.temp = temp
         self.configFile = configFile
         self.configDir = configDir
         self.cf = None
-        if self.configFile is not None:  # Load config file if creating database
+        self.curls = curls
+        self.iurls = iurls
+        self.durls = durls
+
+        if self.configFile is not None:
             self.cf = configing.Configer(name=self.configFile,
                                          base="",
                                          headDirPath=self.configDir,
@@ -184,32 +188,42 @@ def create(self, caid, salt=None):
                             temp=self.temp,
                             reopen=True)
 
-        cf = None
-        if self.cf is not None:  # Load config file if creating database
-            data = dict(self.cf.get())
-            if "keria" in data:
-                curls = data["keria"]
-                data[f"agent-{caid}"] = curls
-                del data["keria"]
-
-            cf = configing.Configer(name=f"{caid}",
-                                    base="",
-                                    human=False,
-                                    temp=self.temp,
-                                    reopen=True,
-                                    clear=False)
-            cf.put(data)
+        timestamp = nowIso8601()
+        data = dict(self.cf.get() if self.cf is not None else { "dt": timestamp })
+
+        habName = f"agent-{caid}"
+        if "keria" in data:
+            data[habName] = data["keria"]
+            del data["keria"]
+
+        if self.curls is not None and isinstance(self.curls, list):
+            data[habName] = { "dt": timestamp, "curls": self.curls }
+
+        if self.iurls is not None and isinstance(self.iurls, list):
+            data["iurls"] = self.iurls
+
+        if self.durls is not None and isinstance(self.durls, list):
+            data["durls"] = self.durls
+
+        config = configing.Configer(name=f"{caid}",
+                                base="",
+                                human=False,
+                                temp=self.temp,
+                                reopen=True,
+                                clear=False)
+
+        config.put(data)
 
         # Create the Hab for the Agent with only 2 AIDs
-        agentHby = habbing.Habery(name=caid, base=self.base, bran=self.bran, ks=ks, cf=cf, temp=self.temp, salt=salt)
-        agentHab = agentHby.makeHab(f"agent-{caid}", ns="agent", transferable=True, delpre=caid)
+        agentHby = habbing.Habery(name=caid, base=self.base, bran=self.bran, ks=ks, cf=config, temp=self.temp, salt=salt)
+        agentHab = agentHby.makeHab(habName, ns="agent", transferable=True, delpre=caid)
         agentRgy = Regery(hby=agentHby, name=agentHab.name, base=self.base, temp=self.temp)
 
-        agent = Agent(agentHby, agentRgy, agentHab,
+        agent = Agent(hby=agentHby,
+                      rgy=agentRgy,
+                      agentHab=agentHab,
                       caid=caid,
-                      agency=self,
-                      configDir=self.configDir,
-                      configFile=self.configFile)
+                      agency=self)
 
         self.adb.agnt.pin(keys=(caid,),
                           val=coring.Prefixer(qb64=agent.pre))

src/keria/app/cli/commands/start.py

@@ -52,7 +52,6 @@
 parser.add_argument('--config-file',
                     dest="configFile",
                     action='store',
-                    default="",
                     help="configuration filename")
 parser.add_argument("--config-dir",
                     dest="configDir",
@@ -70,6 +69,9 @@
 parser.add_argument("--logfile", action="store", required=False, default=None,
                     help="path of the log file. If not defined, logs will not be written to the file.")
 
+def getListVariable(name):
+    value = os.getenv(name)
+    return value.split(";") if value else None
 
 def launch(args):
     help.ogler.level = logging.getLevelName(args.loglevel)
@@ -94,7 +96,10 @@ def launch(args):
                             certpath=args.certpath,
                             cafilepath=args.cafilepath,
                             cors=os.getenv("KERI_AGENT_CORS", "false").lower() in ("true", "1"),
-                            releaseTimeout=os.getenv("KERIA_RELEASER_TIMEOUT", "86400"))
+                            releaseTimeout=int(os.getenv("KERIA_RELEASER_TIMEOUT", "86400")),
+                            curls=getListVariable("KERIA_CURLS"),
+                            iurls=getListVariable("KERIA_IURLS"),
+                            durls=getListVariable("KERIA_DURLS"))
 
     directing.runController(doers=agency, expire=0.0)
 

tests/app/test_agenting.py

@@ -202,6 +202,52 @@ def test_agency():
         assert caid not in agency.agents
         assert len(agent.doers) == 0
 
+def test_agency_without_config_file():
+    salt = b'0123456789abcdef'
+    salter = core.Salter(raw=salt)
+    cf = configing.Configer(name="keria", headDirPath=SCRIPTS_DIR, temp=True, reopen=True, clear=False)
+
+    with habbing.openHby(name="keria", salt=salter.qb64, temp=True, cf=cf) as hby:
+        hby.makeHab(name="test")
+
+        agency = agenting.Agency(name="agency", base="", bran=None, temp=True, configFile="", configDir=SCRIPTS_DIR)
+        assert agency.cf is None
+
+        doist = doing.Doist(limit=1.0, tock=0.03125, real=True)
+        doist.extend(doers=[agency])
+
+        # Ensure we can still create agent
+        caid = "ELI7pg979AdhmvrjDeam2eAO2SR5niCgnjAJXJHtJose"
+        agent = agency.create(caid, salt=salter.qb64)
+        assert agent.pre == "EIAEKYpTygdBtFHBrHKWeh0aYCdx0ZJqZtzQLFnaDB2b"
+
+def test_agency_with_urls_from_arguments():
+    salt = b'0123456789abcdef'
+    salter = core.Salter(raw=salt)
+    cf = configing.Configer(name="keria", headDirPath=SCRIPTS_DIR, temp=True, reopen=True, clear=False)
+
+    with habbing.openHby(name="keria", salt=salter.qb64, temp=True, cf=cf) as hby:
+        hby.makeHab(name="test")
+
+        curls = ["http://example.com:3902/"]
+        iurls = ["http://example.com:5432/oobi"]
+        durls = ["http://example.com:7723/oobi"]
+        agency = agenting.Agency(name="agency", base="", bran=None, temp=True, configDir=SCRIPTS_DIR, curls=curls, iurls=iurls, durls=durls)
+        assert agency.cf is None
+
+        doist = doing.Doist(limit=1.0, tock=0.03125, real=True)
+        doist.extend(doers=[agency])
+
+        # Ensure we can still create agent
+        caid = "ELI7pg979AdhmvrjDeam2eAO2SR5niCgnjAJXJHtJose"
+        agent = agency.create(caid, salt=salter.qb64)
+        assert agent.pre == "EIAEKYpTygdBtFHBrHKWeh0aYCdx0ZJqZtzQLFnaDB2b"
+
+        assert agent.hby.cf is not None
+        assert agent.hby.cf.get()[f"agent-{caid}"]["curls"] == curls
+        assert agent.hby.cf.get()["iurls"] == iurls
+        assert agent.hby.cf.get()["durls"] == durls
+
 def test_boot_ends(helpers):
     agency = agenting.Agency(name="agency", bran=None, temp=True)
     doist = doing.Doist(limit=1.0, tock=0.03125, real=True)