Skip to content

Commit 4e93929

Browse files
CR-12940-poor-env (#59)
* Cleaner Co-authored-by: Saffi <saffi.hartal@codefresh.io>
1 parent dc3371b commit 4e93929

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

action.yaml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,21 @@ runs:
136136
CF_JIRA_FAIL_ON_NOT_FOUND: "${{ inputs.CF_JIRA_FAIL_ON_NOT_FOUND }}"
137137

138138
# github
139-
CF_GITHUB_REF_NAME: "${{ github.ref_name }}"
140-
CF_GITHUB_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
141-
CF_GITHUB_PAYLOAD_MESSAGE: "${{ github.event.client_payload.message }}"
142-
CF_GITHUB_REPOSITORY: "${{ github.repository }}"
139+
GITHUB_REF_NAME: "${{ github.ref_name }}"
140+
GITHUB_REPOSITORY: "${{ github.repository }}"
141+
GITHUB_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
142+
GITHUB_PAYLOAD_MESSAGE: "${{ github.event.client_payload.message }}"
143143

144144

145145
run: |
146146
# add defaults
147-
export CF_GIT_BRANCH="${CF_GIT_BRANCH:-$CF_GITHUB_REF_NAME}"
148-
export CF_GIT_REPO="${CF_GIT_REPO:-$CF_GITHUB_REPOSITORY}"
147+
export CF_GIT_BRANCH="${CF_GIT_BRANCH:-$GITHUB_REF_NAME}"
148+
export CF_GIT_REPO="${CF_GIT_REPO:-$GITHUB_REPOSITORY}"
149149
# built vars
150150
export CF_WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
151151
export CF_GIT_PROVIDER="${CF_GIT_PROVIDER:-github}"
152152
export CF_CI_TYPE=github-actions
153153
154-
# convert env vars to -e var1 -e var 2 string
155-
KEYS=($(jq -n 'env' -S -M -c | jq 'keys' -M -c))
156-
arr=()
157-
for i in $(echo $KEYS | tr "[" "\n" | tr "]" "\n" | tr '"' '\n' | tr "," "\n")
158-
do
159-
if [[ $i == CF_* ]]
160-
then
161-
arr+=" -e $i "
162-
fi
163-
done
164-
165-
docker run $arr "quay.io/codefresh/codefresh-report-image:$VERSION"
154+
env | cut -f 1 -d "=" | grep -E "^CF_" > cf_env
155+
echo "Provided env vars: $(cat cd_env|xargs echo)"
156+
docker run --env-file=cf_env "quay.io/codefresh/codefresh-report-image:$VERSION"

service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: csdp-report-image
2-
version: 0.0.80
2+
version: 0.0.81
33

0 commit comments

Comments
 (0)