diff --git a/.env b/.env index 23805025b816a7b1f7d9bab76efbc2de7476d89c..744816236eefe32839e3cb35df242022e98bf113 100644 --- a/.env +++ b/.env @@ -16,12 +16,15 @@ APP_ENV=dev APP_SECRET= -# Auth related +###> dbp/relay-core-bundle ### +CORE_API_BUILDINFO=unknown +CORE_API_BUILDINFO_URL=# +###< dbp/relay-core-bundle ### + +###> dbp/relay-auth-bundle ### AUTH_SERVER_URL=https://auth.your-server/auth/realms/your-realm AUTH_APIDOCS_KEYCLOAK_SERVER=https://auth.your-server/auth AUTH_APIDOCS_KEYCLOAK_REALM=your-realm AUTH_APIDOCS_KEYCLOAK_CLIENT_ID=api-docs-client-id +###< dbp/relay-auth-bundle ### -# Deployment related -API_BUILDINFO=unknown # a git hash or something identifying the build -API_BUILDINFO_URL='#' diff --git a/config/packages/dbp_relay_core.yaml b/config/packages/dbp_relay_core.yaml index 553db715ed0200159a44d2d244232f8ab064e70c..b9026f2af1a4a9a9d60340357a8d6ddd8df8468b 100644 --- a/config/packages/dbp_relay_core.yaml +++ b/config/packages/dbp_relay_core.yaml @@ -1,3 +1,3 @@ dbp_relay_core: - build_info: '%env(API_BUILDINFO)%' - build_info_url: '%env(API_BUILDINFO_URL)%' + build_info: '%env(CORE_API_BUILDINFO)%' + build_info_url: '%env(CORE_API_BUILDINFO_URL)%' diff --git a/symfony.lock b/symfony.lock index 1177b0efdeab64fd9e732695f1ca227ee9d61dd4..23272abf11506c897d6599e4a0f1f74f7e7c1a97 100644 --- a/symfony.lock +++ b/symfony.lock @@ -32,10 +32,28 @@ "version": "2.0.2" }, "dbp/relay-auth-bundle": { - "version": "v0.1.6" + "version": "0.1", + "recipe": { + "repo": "github.com/digital-blueprint/symfony-recipes", + "branch": "main", + "version": "0.1", + "ref": "1195a75c2c8826343f3cc936a06a883f986a56ae" + }, + "files": [ + "config/packages/dbp_relay_auth.yaml" + ] }, "dbp/relay-core-bundle": { - "version": "v0.1.22" + "version": "0.1", + "recipe": { + "repo": "github.com/digital-blueprint/symfony-recipes", + "branch": "main", + "version": "0.1", + "ref": "d03e655fa1f726593be781f194a5084f99c7c47d" + }, + "files": [ + "config/packages/dbp_relay_core.yaml" + ] }, "dnoegel/php-xdg-base-dir": { "version": "v0.1.1"