Merge branch 'origin/main' into 'next-release/main'
This commit is contained in:
commit
2306ae2d74
2 changed files with 3 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
||||||
FROM gcr.io/kaniko-project/executor:v1.19.2-debug
|
FROM gcr.io/kaniko-project/executor:v1.22.0-debug
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
|
|
|
@ -72,7 +72,7 @@ if [ -n "${PLUGIN_CACHE_TTL:-}" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then
|
if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then
|
||||||
BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read -r build_arg; do echo "--build-arg ${build_arg}"; done)
|
BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read -r build_arg; do echo "--build-arg \"${build_arg}\""; done)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BUILD_ARGS_FROM_ENV=""
|
BUILD_ARGS_FROM_ENV=""
|
||||||
|
@ -146,6 +146,6 @@ fi
|
||||||
"${CACHE_TTL:-}" \
|
"${CACHE_TTL:-}" \
|
||||||
"${CACHE_REPO:-}" \
|
"${CACHE_REPO:-}" \
|
||||||
"${TARGET:-}" \
|
"${TARGET:-}" \
|
||||||
"${BUILD_ARGS:-}" \
|
${BUILD_ARGS:-} \
|
||||||
${BUILD_ARGS_FROM_ENV:-} \
|
${BUILD_ARGS_FROM_ENV:-} \
|
||||||
"${MIRROR:-}"
|
"${MIRROR:-}"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue