Merge branch 'develop' into presentation

cheqd · Jul 3, 2023 · ec7ef80 · ec7ef80
2 parents 6f14a3c + 3d8c0bb
commit ec7ef80
Show file tree

Hide file tree

Showing 6 changed files with 4,810 additions and 9,023 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -115,7 +115,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile
+          file: docker/Dockerfile
           platforms: linux/amd64
           load: true
           target: runner

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+## [2.4.1](https://github.com/cheqd/credential-service/compare/2.4.0...2.4.1) (2023-06-30)
+
+
+### Bug Fixes
+
+* Fix building image for release ([2352114](https://github.com/cheqd/credential-service/commit/2352114e191499ffbc37e456ab8539c2f7fbbcb3))
+
+## [2.4.0](https://github.com/cheqd/credential-service/compare/2.3.1...2.4.0) (2023-06-29)
+
+
+### Features
+
+* Add "authenticated" user roles and permissions, and amend API definitions [DEV-2684] ([#267](https://github.com/cheqd/credential-service/issues/267)) ([2a6b30f](https://github.com/cheqd/credential-service/commit/2a6b30f93dba29f1738f298e535303437a9a1971))
+
+
+### Bug Fixes
+
+* Fix bug where credential-service expects config variables with authentication and external DB disabled [DEV-2843] ([#276](https://github.com/cheqd/credential-service/issues/276)) ([4008bdf](https://github.com/cheqd/credential-service/commit/4008bdfcc0e372af4b31a914e121c561da3ed63c))
+* Fix for the order of auth handlers ([#275](https://github.com/cheqd/credential-service/issues/275)) ([6d3bb77](https://github.com/cheqd/credential-service/commit/6d3bb778c7e9884e66058941431da9a898025333))
+* Fix local storage instantiating ([#269](https://github.com/cheqd/credential-service/issues/269)) ([6ec820f](https://github.com/cheqd/credential-service/commit/6ec820f83c6d1c9b0a34e0bde10bcec25a51c5ef))
+
+## [2.4.0-develop.4](https://github.com/cheqd/credential-service/compare/2.4.0-develop.3...2.4.0-develop.4) (2023-06-28)
+
+## [2.4.0-develop.3](https://github.com/cheqd/credential-service/compare/2.4.0-develop.2...2.4.0-develop.3) (2023-06-27)
+
+
+### Bug Fixes
+
+* Fix bug where credential-service expects config variables with authentication and external DB disabled [DEV-2843] ([#276](https://github.com/cheqd/credential-service/issues/276)) ([4008bdf](https://github.com/cheqd/credential-service/commit/4008bdfcc0e372af4b31a914e121c561da3ed63c))
+
 ## [2.4.0-develop.2](https://github.com/cheqd/credential-service/compare/2.4.0-develop.1...2.4.0-develop.2) (2023-06-26)
 
 

diff --git a/docker/no-external-db/docker-compose-no-db.yml b/docker/no-external-db/docker-compose-no-db.yml
@@ -2,12 +2,16 @@ version: '3.8'
 
 # CAUTION: Please ensure you edit necessary values in .env.no-db before using this Docker Compose file.
 
-# SYNTAX: docker compose -f docker/docker-compose-no-db.yml up --detach
+# SYNTAX: docker compose -f docker/no-external-db/docker-compose-no-db.yml up --detach
 
 services:
   app:
+    # To change the image version, edit the ":latest" tag to the desired version
+    # For production/stable release, use ":latest"
+    # For development/staging release, use ":staging-latest"
     image: ghcr.io/cheqd/credential-service:latest
     ports:
       - 3000:3000
+    # NOTE: Edit the values present within this file before running the service
     env_file:
       - no-db.env
diff --git a/example.env b/example.env
@@ -17,8 +17,8 @@ LOGTO_DEFAULT_RESOURCE_URL='http://localhost:8787'
 LOGTO_ENDPOINT='http://localhost:3001'
 LOGTO_APP_ID='ldfsr...rq432'
 LOGTO_APP_SECRET='sdf...sdf'
-LOGTO_M2M_APP_ID="aaaa.....ddddd"
-LOGTO_M2M_APP_SECRET="aaaa.....ddddd"
+LOGTO_M2M_APP_ID="aaaa...ddddd"
+LOGTO_M2M_APP_SECRET="aaaa...ddddd"
 LOGTO_MANAGEMENT_API="https://default.logto.app/api"
 COOKIE_SECRET='sdf...sdf'