Merge branch 'main' into hotfix/backstage/urls

devxp-tech · Dec 27, 2023 · da039ac · da039ac
2 parents 5442e51 + 6dac3f3
commit da039ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/app-config.yaml b/app/app-config.yaml
@@ -116,6 +116,7 @@ proxy:
     # url to the api and path of your hosted prometheus instance
     target: https://prometheus.devxp-tech.io/api/v1/
 
+
   # '/snyk':
   #   target: https://snyk.io/api/v1
   #   headers:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - ARGOCD_AUTH_TOKEN=$ARGOCD_AUTH_TOKEN
       - AUTH_GITHUB_CLIENT_ID=$AUTH_GITHUB_CLIENT_ID
       - AUTH_GITHUB_CLIENT_SECRET=$AUTH_GITHUB_CLIENT_SECRET
+      - ARGOCD_AUTH_TOKEN=$ARGOCD_AUTH_TOKEN
       - ENV=development
       - GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN
       - GIT_DISCOVERY_ACROSS_FILESYSTEM=1