chore: resolve rebase conflict

hyperledger · Apr 18, 2024 · 48ff338 · 48ff338
1 parent b77cdf1
commit 48ff338
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 14 deletions.
diff --git a/examples/.nickel/root.ncl b/examples/.nickel/root.ncl
@@ -14,7 +14,7 @@ in
 
   st-oidc4vc =
     (stack.makeAgentStack { name = "issuer", port = 8080 })
-    & (stack.makeMockServerStack { port = 5000 })
+    & (stack.makeMockServerStack { port = 7777 })
     & (
       stack.makeIssuerKeycloakStack
         {

diff --git a/examples/.nickel/versions.ncl b/examples/.nickel/versions.ncl
@@ -1,6 +1,6 @@
 {
   # identus
-  agent = "1.30.1-SNAPSHOT",
+  agent = "1.31.0-SNAPSHOT",
   node = "2.2.1",
   # 3rd party
   caddy = "2.7.6-alpine",

diff --git a/examples/mt-keycloak-vault/compose.yaml b/examples/mt-keycloak-vault/compose.yaml
@@ -52,7 +52,7 @@ services:
       SECRET_STORAGE_BACKEND: vault
       VAULT_ADDR: http://vault-default:8200
       VAULT_TOKEN: admin
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-default:
     configs:

diff --git a/examples/mt-keycloak/compose.yaml b/examples/mt-keycloak/compose.yaml
@@ -50,7 +50,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-default:8080/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-default:
     configs:

diff --git a/examples/mt/compose.yaml b/examples/mt/compose.yaml
@@ -43,7 +43,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-default:8080/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-default:
     configs:

diff --git a/examples/st-multi/compose.yaml b/examples/st-multi/compose.yaml
@@ -75,7 +75,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-holder:8081/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   agent-issuer:
     depends_on:
@@ -104,7 +104,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-issuer:8080/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   agent-verifier:
     depends_on:
@@ -133,7 +133,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-verifier:8082/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-holder:
     configs:

diff --git a/examples/st-oidc4vc/compose.yaml b/examples/st-oidc4vc/compose.yaml
@@ -1,5 +1,3 @@
----
-
 configs:
   caddyfile_issuer:
     content: |-
@@ -17,7 +15,6 @@ configs:
           reverse_proxy vault-issuer:8200
         }
       }
-
 services:
   agent-issuer:
     depends_on:
@@ -46,7 +43,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-issuer:8080/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-issuer:
     configs:

diff --git a/examples/st-vault/compose.yaml b/examples/st-vault/compose.yaml
@@ -45,7 +45,7 @@ services:
       SECRET_STORAGE_BACKEND: vault
       VAULT_ADDR: http://vault-issuer:8200
       VAULT_TOKEN: admin
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-issuer:
     configs:

diff --git a/examples/st/compose.yaml b/examples/st/compose.yaml
@@ -43,7 +43,7 @@ services:
       PRISM_NODE_PORT: '50053'
       REST_SERVICE_URL: http://caddy-issuer:8080/prism-agent
       SECRET_STORAGE_BACKEND: postgres
-    image: ghcr.io/input-output-hk/prism-agent:1.30.1-SNAPSHOT
+    image: ghcr.io/input-output-hk/prism-agent:1.31.0-SNAPSHOT
     restart: always
   caddy-issuer:
     configs: