From 4ac770d98407281d67d00b7779bca90c752f9d46 Mon Sep 17 00:00:00 2001 From: lenkan Date: Mon, 9 Dec 2024 15:09:42 +0100 Subject: [PATCH 1/2] remove redundant configuration for keria --- config/keria.json | 15 --------------- docker-compose.yaml | 5 ++--- .../test-setup-single-client.test.ts | 3 --- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100755 config/keria.json diff --git a/config/keria.json b/config/keria.json deleted file mode 100755 index 3094cf42..00000000 --- a/config/keria.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dt": "2023-12-01T10:05:25.062609+00:00", - "keria": { - "dt": "2023-12-01T10:05:25.062609+00:00", - "curls": ["http://keria:3902/"] - }, - "iurls": [ - "http://witness-demo:5642/oobi/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha/controller", - "http://witness-demo:5643/oobi/BLskRTInXnMxWaGqcpSyMgo0nYbalW99cGZESrz3zapM/controller", - "http://witness-demo:5644/oobi/BIKKuvBwpmDVA4Ds-EpL5bt9OqPzWPja2LigFYZN2YfX/controller", - "http://witness-demo:5645/oobi/BM35JN8XeJSEfpxopjn5jr7tAHCE5749f0OobhMLCorE/controller", - "http://witness-demo:5646/oobi/BIj15u5V11bkbtAxMA7gcNJZcax-7TgaBMLsQnMHpYHP/controller", - "http://witness-demo:5647/oobi/BF2rZTW79z4IXocYRQnjjsOuvFUQv-ptCf8Yltd7PfsM/controller" - ] -} diff --git a/docker-compose.yaml b/docker-compose.yaml index 1900fea1..09a9bb15 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -24,10 +24,9 @@ services: image: ${KERIA_IMAGE:-weboftrust/keria}:${KERIA_IMAGE_TAG:-0.2.0-dev5} environment: KERI_AGENT_CORS: 1 + KERIA_CURLS: http://keria:3902/ + KERIA_IURLS: http://witness-demo:5642/oobi/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha/controller;http://witness-demo:5643/oobi/BLskRTInXnMxWaGqcpSyMgo0nYbalW99cGZESrz3zapM/controller;http://witness-demo:5644/oobi/BIKKuvBwpmDVA4Ds-EpL5bt9OqPzWPja2LigFYZN2YfX/controller <<: *python-env - volumes: - - ./config/keria.json:/keria/config/keri/cf/keria.json - command: --config-dir /keria/config --config-file keria --name agent healthcheck: test: wget --spider http://keria:3902/spec.yaml <<: *healthcheck diff --git a/examples/integration-scripts/test-setup-single-client.test.ts b/examples/integration-scripts/test-setup-single-client.test.ts index bd957743..7b9188c9 100644 --- a/examples/integration-scripts/test-setup-single-client.test.ts +++ b/examples/integration-scripts/test-setup-single-client.test.ts @@ -83,9 +83,6 @@ describe('test-setup-single-client', () => { 'http://witness-demo:5642/oobi/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha/controller', 'http://witness-demo:5643/oobi/BLskRTInXnMxWaGqcpSyMgo0nYbalW99cGZESrz3zapM/controller', 'http://witness-demo:5644/oobi/BIKKuvBwpmDVA4Ds-EpL5bt9OqPzWPja2LigFYZN2YfX/controller', - 'http://witness-demo:5645/oobi/BM35JN8XeJSEfpxopjn5jr7tAHCE5749f0OobhMLCorE/controller', - 'http://witness-demo:5646/oobi/BIj15u5V11bkbtAxMA7gcNJZcax-7TgaBMLsQnMHpYHP/controller', - 'http://witness-demo:5647/oobi/BF2rZTW79z4IXocYRQnjjsOuvFUQv-ptCf8Yltd7PfsM/controller', ], }); break; From c53a0973a4a2434866903adcf23d7b4bfff81381 Mon Sep 17 00:00:00 2001 From: lenkan Date: Thu, 12 Dec 2024 16:00:12 +0100 Subject: [PATCH 2/2] update docker image tag --- .github/workflows/main.yml | 2 +- docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3fed1da..458be1a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,7 +57,7 @@ jobs: strategy: matrix: os: ['ubuntu-latest'] - keria-version: ['0.2.0-dev5'] + keria-version: ['0.2.0-dev6'] node-version: ['20'] env: KERIA_IMAGE_TAG: ${{ matrix.keria-version }} diff --git a/docker-compose.yaml b/docker-compose.yaml index 09a9bb15..4fb2b5cd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,7 +21,7 @@ services: - 7723:7723 keria: - image: ${KERIA_IMAGE:-weboftrust/keria}:${KERIA_IMAGE_TAG:-0.2.0-dev5} + image: ${KERIA_IMAGE:-weboftrust/keria}:${KERIA_IMAGE_TAG:-0.2.0-dev6} environment: KERI_AGENT_CORS: 1 KERIA_CURLS: http://keria:3902/