Skip to content

Commit

Permalink
Merge branch 'main' into update/main/sbt-native-packager-1.10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
yshyn-iohk authored Aug 21, 2024
2 parents e7f4f39 + 69f0124 commit dbe60d5
Show file tree
Hide file tree
Showing 25 changed files with 11 additions and 509 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ page
- Clone the repository

```
git clone [email protected]:input-output-hk/atala-prism-mediator.git
git clone [email protected]:hyperledger/identus-mediator.git
```

```
Expand Down Expand Up @@ -272,9 +272,9 @@ https://input-output-hk.github.io/didcomm-v2-mediator-test-suite/Reports.html

[Badge-Discord]: https://img.shields.io/discord/1146426895114702858?logo=discord "chat on discord"

[Badge-CI]: https://github.com/input-output-hk/atala-prism-mediator/workflows/CI/badge.svg
[Badge-CI]: https://github.com/hyperledger/identus-mediator/workflows/CI/badge.svg

[Badge-CommitsSinceLatestRelease]: https://img.shields.io/github/commits-since/input-output-hk/atala-prism-mediator/prism-mediator-v0.9.2/main?logo=github
[Badge-CommitsSinceLatestRelease]: https://img.shields.io/github/commits-since/hyperledger/identus-mediator/prism-mediator-v0.9.2/main?logo=github


[Atala-Symbol]:https://img.shields.io/badge/Mediator-Instance-blue.svg?logo=data:image/svg%2bxml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGlkPSJMYXllcl8yIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMTguMjEgMzI1LjE4Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6IzU1NTlmMjtmaWxsLXJ1bGU6ZXZlbm9kZDt9PC9zdHlsZT48L2RlZnM+PGcgaWQ9IkxheWVyXzEtMiI+PGc+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTU5LjkxLDIxLjU4TDc0LjIzLDE2OC45MmMtMy4wOSw1LjMxLTEwLjc3LDUuMy0xMy44NC0uMDJsLTUuNS05LjU0Yy0xLjQzLTIuNDgtMS40My01LjU0LC4wMS04LjAyTDE0MC42LDMuOThjMy4wOS01LjMyLDEwLjc5LTUuMywxMy44NSwuMDRsNS40OSw5LjU2YzEuNDIsMi40OCwxLjQyLDUuNTMtLjAyLDhaIi8+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNjAuMywxOTIuODhsLTM0LjM1LDU5LjA3Yy0xLjQ0LDIuNDctNC4wOSwzLjk5LTYuOTUsMy45OGwtMTEuMDItLjA0Yy02LjE1LS4wMi05Ljk4LTYuNy02Ljg4LTEyLjAybDM0LjM1LTU5LjA3YzEuNDQtMi40Nyw0LjA5LTMuOTksNi45NS0zLjk4bDExLjAyLC4wNGM2LjE1LC4wMiw5Ljk4LDYuNyw2Ljg4LDEyLjAyWiIvPjxwYXRoIGlkPSJGaWxsLTIiIGNsYXNzPSJjbHMtMSIgZD0iTTY2Ljk2LDI1Ni4xbDExLjAyLC4wNGMyLjg2LC4wMSw1LjUxLTEuNTEsNi45NC0zLjk4TDE4OS4yOCw3Mi43MmMxLjQ0LTIuNDcsMS40NS01LjUyLC4wMi04bC01LjQ5LTkuNTZjLTMuMDYtNS4zNC0xMC43Ni01LjM2LTEzLjg1LS4wNEw2MC4wNywyNDQuMDhjLTMuMDksNS4zMiwuNzMsMTEuOTksNi44OCwxMi4wMloiLz48cGF0aCBpZD0iRmlsbC0zIiBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjUuOTMsMjU2LjMzbDExLjAyLC4wNGMyLjg2LC4wMSw1LjUxLTEuNTEsNi45NS0zLjk4TDIxOC42NCwxMjMuODZjMS40NC0yLjQ3LDEuNDUtNS41MiwuMDItOGwtNS40OS05LjU2Yy0zLjA2LTUuMzQtMTAuNzYtNS4zNi0xMy44NS0uMDRMMTE5LjA0LDI0NC4zMWMtMy4wOSw1LjMyLC43MywxMS45OSw2Ljg4LDEyLjAyWiIvPjxwYXRoIGlkPSJGaWxsLTQiIGNsYXNzPSJjbHMtMSIgZD0iTTE3My4zOCwyNjAuNTJsNS41MSw5LjUyYzMuMDgsNS4zMiwxMC43NSw1LjMyLDEzLjg0LC4wMWw2NS4zOS0xMTIuNDVjMy4wOS01LjMyLS43My0xMS45OS02Ljg4LTEyLjAybC0xMS4wMi0uMDRjLTIuODYtLjAxLTUuNTEsMS41MS02Ljk1LDMuOThsLTU5Ljg4LDEwMi45N2MtMS40NCwyLjQ4LTEuNDUsNS41NCwwLDguMDNaIi8+PHBhdGggaWQ9IkZpbGwtNSIgY2xhc3M9ImNscy0xIiBkPSJNMjIyLjEsMzIxLjJsMTkuNS0zMy41NGMxLjQ0LTIuNDcsMS40NS01LjUyLC4wMi04bC01LjQ5LTkuNTZjLTMuMDYtNS4zNC0xMC43Ni01LjM2LTEzLjg1LS4wNGwtMTkuNTIsMzMuNThjLTEuNDQsMi40OC0xLjQ1LDUuNTQsMCw4LjAzbDUuNTEsOS41MmMzLjA4LDUuMzIsMTAuNzUsNS4zMiwxMy44NCwuMDFaIi8+PHBhdGggaWQ9IkZpbGwtNiIgY2xhc3M9ImNscy0xIiBkPSJNMzEwLjI2LDE0NS43N2wtMTEtLjA4Yy0yLjg3LS4wMi01LjUzLDEuNS02Ljk3LDMuOThsLTU2LjA5LDk2LjQ2Yy0zLjA5LDUuMzIsLjczLDEyLDYuODgsMTIuMDJsMTEuMDIsLjA0YzIuODYsLjAxLDUuNTEtMS41MSw2Ljk0LTMuOThsNTYuMDctOTYuNDJjMy4wOS01LjMxLS43MS0xMS45Ny02Ljg2LTEyLjAyWiIvPjwvZz48L2c+PC9zdmc+
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ lazy val mediator = project
.settings(
Compile / mainClass := Some("org.hyperledger.identus.mediator.MediatorStandalone"),
Docker / maintainer := "[email protected]",
Docker / dockerUsername := Some("input-output-hk"),
Docker / dockerUsername := Some("hyperledger"),
Docker / dockerRepository := Some("ghcr.io"),
Docker / packageName := "identus-mediator",
dockerExposedPorts := Seq(8080),
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: mongo:6.0
ports:
- "27017:27017"
command: ["--auth"]
command: [ "--auth" ]
environment:
- MONGO_INITDB_ROOT_USERNAME=admin
- MONGO_INITDB_ROOT_PASSWORD=admin
Expand All @@ -14,7 +14,7 @@ services:
- ./initdb.js:/docker-entrypoint-initdb.d/initdb.js

identus-mediator:
image: ghcr.io/input-output-hk/identus-mediator:${MEDIATOR_VERSION:-latest}
image: ghcr.io/hyperledger/identus-mediator:${MEDIATOR_VERSION:-latest}
ports:
- "8080:8080"
environment:
Expand All @@ -26,7 +26,7 @@ services:
- KEY_AGREEMENT_X=Sr4SkIskjN_VdKTn0zkjYbhGTWArdUNE4j_DmUpnQGw
- KEY_AUTHENTICATION_D=INXCnxFEl0atLIIQYruHzGd5sUivMRyQOzu87qVerug
- KEY_AUTHENTICATION_X=MBjnXZxkMcoQVVL21hahWAw43RuAG-i64ipbeKKqwoA
- SERVICE_ENDPOINTS=http://localhost:8080;ws://localhost:8080/ws
- SERVICE_ENDPOINTS=${SERVICE_ENDPOINTS:-http://localhost:8080;ws://localhost:8080/ws}
- MONGODB_USER=admin
- MONGODB_PASSWORD=admin
- MONGODB_PROTOCOL=mongodb
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed infrastructure/charts/identus-mediator-0.15.0.tgz
Binary file not shown.
Binary file not shown.
54 changes: 0 additions & 54 deletions infrastructure/charts/index.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions infrastructure/charts/mediator/.helmignore

This file was deleted.

22 changes: 0 additions & 22 deletions infrastructure/charts/mediator/Chart.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions infrastructure/charts/mediator/templates/_helpers.tpl

This file was deleted.

18 changes: 0 additions & 18 deletions infrastructure/charts/mediator/templates/apisixconsumer.yaml

This file was deleted.

67 changes: 0 additions & 67 deletions infrastructure/charts/mediator/templates/apisixroute.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions infrastructure/charts/mediator/templates/apisixtls.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions infrastructure/charts/mediator/templates/certificate.yaml

This file was deleted.

55 changes: 0 additions & 55 deletions infrastructure/charts/mediator/templates/deployment.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions infrastructure/charts/mediator/templates/externalsecret.yaml

This file was deleted.

Loading

0 comments on commit dbe60d5

Please sign in to comment.