Merge branch '1-conflict_vault_and_scoped_variable' into 'master'

fix: conflict between vault and scoped vars

Closes #1

See merge request to-be-continuous/openshift!1

templates/gitlab-ci-openshift.yml

@@ -236,7 +236,7 @@ stages:
   }
 
   function eval_all_secrets() {
-    encoded_vars=$(env | grep -v '^scoped__' | awk -F '=' '/^[a-zA-Z0-9_]*=@(b64|hex|url)@/ {print $1}')
+    encoded_vars=$(env | grep -Ev '(^|.*_ENV_)scoped__' | awk -F '=' '/^[a-zA-Z0-9_]*=@(b64|hex|url)@/ {print $1}')
     for var in $encoded_vars
     do
       eval_secret "$var"