From 060dbcbe111c1e177b4f47b6ff3ad76b51ea9dc3 Mon Sep 17 00:00:00 2001 From: Lance Date: Wed, 6 Mar 2024 09:52:25 -0500 Subject: [PATCH] upgrading to keri 1.1.4 and fixing entrypoint issues and upgrade (#56) Signed-off-by: 2byrds <2byrds@gmail.com> --- docker-compose.yml | 5 ++++- images/webs.dockerfile | 2 +- setup.py | 6 +++--- .../ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe/keri.cesr | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c2e286d..429c04a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: witnesshost: container_name: witnesshost hostname: witnesshost - image: gleif/keri:1.1.0 + image: weboftrust/keri:1.1.4 platform: linux/amd64 tty: true volumes: @@ -27,6 +27,7 @@ services: context: . dockerfile: ./images/webs.dockerfile image: 2byrds/webs:latest + entrypoint: tail -f /dev/null tty: true volumes: - ./volume/dkr/examples:/usr/local/var/webs/volume/dkr/examples @@ -51,6 +52,7 @@ services: - ./volume/dkr/pages:/usr/local/var/webs/volume/dkr/pages # networks: # - websnet + entrypoint: tail -f /dev/null # entrypoint: dkr did webs service --name webserve --config-dir /usr/local/var/webs/volume/dkr/examples/my-scripts --config-file config-docker did-webs-resolver: @@ -67,5 +69,6 @@ services: - ./volume/dkr/examples:/usr/local/var/webs/volume/dkr/examples depends_on: - webs + entrypoint: tail -f /dev/null # networks: # - websnet diff --git a/images/webs.dockerfile b/images/webs.dockerfile index bee568b..a1ffea0 100644 --- a/images/webs.dockerfile +++ b/images/webs.dockerfile @@ -1,4 +1,4 @@ -FROM gleif/keri:1.0.1 +FROM weboftrust/keri:1.1.4 WORKDIR /usr/local/var diff --git a/setup.py b/setup.py index 37407d5..85a0828 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setup( name='dkr', - version='0.0.1', # also change in src/did-webs-resolver/__init__.py + version='0.0.7', # also change in src/did-webs-resolver/__init__.py license='Apache Software License 2.0', description='did:webs DID Method Resolver', long_description="did:webs DID Method Resolver.", @@ -63,7 +63,7 @@ keywords=[ # eg: 'keyword1', 'keyword2', 'keyword3', ], - python_requires='>=3.10.4', + python_requires='>=3.10.13', install_requires=[ 'aiohttp>=3.7.4', 'lmdb>=1.3.0', @@ -73,7 +73,7 @@ 'cbor2>=5.4.3', 'multidict>=6.0.2', 'ordered-set>=4.1.0', - 'keri>=1.1.1', + 'keri>=1.1.4', 'hio>=0.6.9', 'multicommand>=1.0.0', 'jsonschema>=4.17.0', diff --git a/volume/dkr/pages/ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe/keri.cesr b/volume/dkr/pages/ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe/keri.cesr index c1b5280..64c2068 100644 --- a/volume/dkr/pages/ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe/keri.cesr +++ b/volume/dkr/pages/ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe/keri.cesr @@ -1 +1 @@ -{"v":"KERI10JSON00012b_","t":"icp","d":"ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe","i":"ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe","s":"0","kt":"1","k":["DHr0-I-mMN7h6cLMOTRJkkfPuMd0vgQPrOk4Y3edaHjr"],"nt":"1","n":["ELa775aLyane1vdiJEuexP8zrueiIoG995pZPGJiBzGX"],"bt":"0","b":[],"c":[],"a":[]}-VAn-AABAADjfOjbPu9OWce59OQIc-y3Su4kvfC2BAd_e_NLHbXcOK8-3s6do5vBfrxQ1kDyvFGCPMcSl620dLMZ4QDYlvME-EAB0AAAAAAAAAAAAAAAAAAAAAAA1AAG2024-03-05T21c39c14d485928p00c00 \ No newline at end of file +{"v":"KERI10JSON00012b_","t":"icp","d":"ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe","i":"ENro7uf0ePmiK3jdTo2YCdXLqW7z7xoP6qhhBou6gBLe","s":"0","kt":"1","k":["DHr0-I-mMN7h6cLMOTRJkkfPuMd0vgQPrOk4Y3edaHjr"],"nt":"1","n":["ELa775aLyane1vdiJEuexP8zrueiIoG995pZPGJiBzGX"],"bt":"0","b":[],"c":[],"a":[]}-VAn-AABAADjfOjbPu9OWce59OQIc-y3Su4kvfC2BAd_e_NLHbXcOK8-3s6do5vBfrxQ1kDyvFGCPMcSl620dLMZ4QDYlvME-EAB0AAAAAAAAAAAAAAAAAAAAAAA1AAG2024-03-06T14c48c10d241878p00c00 \ No newline at end of file