Merge branch 'main' into feat/refactoring

# Conflicts: # src/main/resources/application.yml
eu-digital-green-certificates · Sep 16, 2021 · c845e55 · c845e55
2 parents 32fd800 + 30503df
commit c845e55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
@@ -33,5 +33,5 @@ jobs:
         CF_SPACE: ${{ secrets.CF_SPACE }}
         CF_USERNAME: ${{ secrets.CF_USERNAME }}
         CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
-        CF_DOCKER_USERNAME: ${{ github.actor }}
-        CF_DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        CF_DOCKER_USERNAME: ${{ secrets.CF_DOCKER_USERNAME }}
+        CF_DOCKER_PASSWORD: ${{ secrets.CF_DOCKER_PASSWORD }}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -24,7 +24,7 @@ dgc:
   #### activeSignKey must be one of signAliases
   activeSignKey: AccessTokenSignKey-1
   encAliases:
-  signAliases: 
+  signAliases:
     - AccessTokenSignKey-1
   keyAliases:
     - AccessTokenServiceKey-1