Skip to content

Commit e4d27ca

Browse files
committed
chore: wip
1 parent a28d53f commit e4d27ca

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

actions/buildkit/action.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,11 @@ runs:
185185
val="${val%\"*}"
186186
val="${val#\'}"
187187
val="${val#\"}"
188-
export SECRET_${key}="${val}"
189-
secret_args+=("--secret id=${key},env=SECRET_${key}")
188+
export SECRET_ENV_${key}="${val}"
189+
secret_args+=("--secret id=${key},env=SECRET_ENV_${key}")
190190
fi
191191
done <<< "$INPUT_SECRETS"
192192
193-
echo secret_args: ${secret_args[@]}
194-
195193
# login to docker registry
196194
export DOCKER_CONFIG=~/.docker
197195
if [ -n "$INPUT_REGISTRY" ]; then
@@ -279,36 +277,19 @@ runs:
279277
local cmd="$1"
280278
local mtls_options="$2"
281279
282-
echo "---------"
283-
echo $cmd $mtls_options build \
284-
--frontend dockerfile.v0 \
285-
--local context=$INPUT_CONTEXT \
286-
--local dockerfile=$INPUT_CONTEXT \
287-
--opt platform=$INPUT_PLATFORMS \
288-
$(echo "$INPUT_BUILD_ARGS" | sed -r '/^\s*$/d' - | sed -r 's/(.*)/--opt build-arg:\1 \\/' -) \
289-
$(echo "$INPUT_LABELS" | sed -r '/^\s*$/d' - | sed -r 's/(.*)/--opt label:\1 \\/' -) \
290-
"$target_args" \
291-
$cache_options \
292-
--opt filename=./$INPUT_DOCKERFILE \
293-
--opt attest:sbom= \
294-
--opt attest:provenance= \
295-
"${secret_args[@]}" \
296-
--output type=image,\"name=$(echo "$INPUT_TAGS" | paste -sd ',' -)\",push=$INPUT_PUSH
297-
echo "---------"
298-
299280
$cmd $mtls_options build \
300281
--frontend dockerfile.v0 \
301282
--local context=$INPUT_CONTEXT \
302283
--local dockerfile=$INPUT_CONTEXT \
303284
--opt platform=$INPUT_PLATFORMS \
304285
$(echo "$INPUT_BUILD_ARGS" | sed -r '/^\s*$/d' - | sed -r 's/(.*)/--opt build-arg:\1 \\/' -) \
305286
$(echo "$INPUT_LABELS" | sed -r '/^\s*$/d' - | sed -r 's/(.*)/--opt label:\1 \\/' -) \
287+
${secret_args[@]} \
306288
"$target_args" \
307289
$cache_options \
308290
--opt filename=./$INPUT_DOCKERFILE \
309291
--opt attest:sbom= \
310292
--opt attest:provenance= \
311-
"${secret_args[@]}" \
312293
--output type=image,\"name=$(echo "$INPUT_TAGS" | paste -sd ',' -)\",push=$INPUT_PUSH
313294
}
314295

0 commit comments

Comments
 (0)