Skip to content

Commit b324886

Browse files
committed
action stabilisation
1 parent 8a8039d commit b324886

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

actions/docker/scan-docker-repo/action.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ outputs:
117117
plan-dir:
118118
description: |
119119
Directory with scanning plan (list of images split into chunks).
120-
value: ${{ steps.init.outputs.plan-dir }}
120+
value: ${{ steps.plan.outputs.plan-dir }}
121121

122122
plan-matrix:
123123
description: |
@@ -183,7 +183,7 @@ runs:
183183
CONCURRENCY: ${{ inputs.concurrency }}
184184
TRIVY_DIR: ${{ steps.init.outputs.trivy-dir }}
185185
IGNORE_LIST: ${{ inputs.ignore-list }}
186-
SKIPPED_LIST_FILE: ${{ steps.init.outputs.skipped-file }}
186+
SKIPPED_FILE: ${{ steps.init.outputs.skipped-file }}
187187
run: |
188188
PLAN_DIR="${TRIVY_DIR}/plan"
189189
@@ -194,6 +194,7 @@ runs:
194194
jq --compact-output --slurp
195195
)"
196196
197+
echo "plan-dir=${PLAN_DIR}" >> "${GITHUB_OUTPUT}"
197198
echo "matrix=${matrix}" >> "${GITHUB_OUTPUT}"
198199
199200
- name: Scan images

actions/docker/scan-docker-repo/create-plan.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ chunks_count="${4}" # number of groups to split into
2525
# Special interface for action
2626
#
2727
: "${IGNORE_LIST:=${script_dir}/ignore-lists}" # file or directory with list of images to ignore
28-
: "${SKIPPED_LIST_FILE:=$(mktemp)}" # file with list of actually skipped images
28+
: "${SKIPPED_FILE:=$(mktemp)}" # file with list of actually skipped images
2929

3030
ignore_lists=()
3131
if [ -n "${IGNORE_LIST}" ]; then
@@ -46,7 +46,7 @@ skip_ignored() {
4646
"${ignore_lists[@]}"; then
4747

4848
[ "${DEBUG}" == "true" ] && log " skipping ${_full_tag} (listed in ignore list)"
49-
echo "${_full_tag}" >> "${SKIPPED_LIST_FILE}"
49+
echo "${_full_tag}" >> "${SKIPPED_FILE}"
5050

5151
return
5252
fi

0 commit comments

Comments
 (0)