diff --git a/Makefile b/Makefile index 6abe2e6e0..ab39a9a62 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,16 @@ .PHONY: build-keri build-keri: - @docker build --no-cache -f images/keripy.dockerfile --tag gleif/keri:1.0.0 . + @docker buildx build --platform=linux/amd64 --no-cache -f images/keripy.dockerfile --tag weboftrust/keri:1.1.0 . .PHONY: build-witness-demo build-witness-demo: - @docker build --no-cache -f images/witness.demo.dockerfile --tag gleif/keri-witness-demo:1.0.0 . + @@docker buildx build --platform=linux/amd64 --no-cache -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.0 . + +.PHONY: publish-keri +publish-keri: + @docker push weboftrust/keri --all-tags + +.PHONY: publish-keri-witness-demo +publish-keri-witness-demo: + @docker push weboftrust/keri-witness-demo --all-tags \ No newline at end of file diff --git a/images/witness.demo.dockerfile b/images/witness.demo.dockerfile index 6705c6cfe..f19b068ac 100644 --- a/images/witness.demo.dockerfile +++ b/images/witness.demo.dockerfile @@ -1,4 +1,4 @@ -FROM gleif/keri:1.0.0 +FROM gleif/keri:1.1.0 SHELL ["/bin/bash", "-c"] EXPOSE 5632 diff --git a/src/keri/app/httping.py b/src/keri/app/httping.py index a0fc44c0d..6f815d4d8 100644 --- a/src/keri/app/httping.py +++ b/src/keri/app/httping.py @@ -221,10 +221,14 @@ def __init__(self): def request(self, method, url, body=None, headers=None): purl = parse.urlparse(url) - client = http.clienting.Client(scheme=purl.scheme, - hostname=purl.hostname, - port=purl.port, - portOptional=True) + try: + client = http.clienting.Client(scheme=purl.scheme, + hostname=purl.hostname, + port=purl.port, + portOptional=True) + except Exception as e: + print(f"error establishing client connection={e}") + return None client.request( method=method, diff --git a/src/keri/app/oobiing.py b/src/keri/app/oobiing.py index c0ce0a7e6..41a5e6c92 100644 --- a/src/keri/app/oobiing.py +++ b/src/keri/app/oobiing.py @@ -455,7 +455,13 @@ def processClients(self): except (kering.ValidationError, ValueError): pass - serder = serdering.SerderKERI(raw=bytearray(response["body"])) + try: + serder = serdering.SerderKERI(raw=bytearray(response["body"])) + except ValueError: + obr.state = Result.failed + self.hby.db.coobi.rem(keys=(url,)) + self.hby.db.roobi.put(keys=(url,), val=obr) + continue if not serder.ked['t'] == coring.Ilks.rpy: obr.state = Result.failed self.hby.db.coobi.rem(keys=(url,)) @@ -512,6 +518,11 @@ def processRetries(self): def request(self, url, obr): client = self.clienter.request("GET", url=url) + if client is None: + self.hby.db.oobis.rem(keys=(url,)) + print(f"error getting client for {url}, aborting OOBI") + return + self.clients[url] = client self.hby.db.oobis.rem(keys=(url,)) self.hby.db.coobi.pin(keys=(url,), val=obr)