Merge #309

309: Use local variables in Bash function. r=reitermarkus a=reitermarkus



Co-authored-by: Markus Reiter <[email protected]>

build-docker-image.sh

@@ -9,15 +9,15 @@ run() {
   local image_name="rustembedded/cross:${1}"
 
   if docker pull "${image_name}"; then
-    cache_from_args=(--cache-from "${image_name}")
+    local cache_from_args=(--cache-from "${image_name}")
   fi
 
   docker build ${cache_from_args[@]} --pull -t "${image_name}" -f "${dockerfile}" .
 
-  version="$(cargo metadata --format-version 1 | jq --raw-output '.packages[] | select(.name == "cross") | .version')"
+  local version="$(cargo metadata --format-version 1 | jq --raw-output '.packages[] | select(.name == "cross") | .version')"
 
   if ! [[ "${version}" =~ alpha ]] && ! [[ "${version}" =~ dev ]]; then
-    versioned_image_name="${image_name}-${version}"
+    local versioned_image_name="${image_name}-${version}"
     docker tag "${image_name}" "${versioned_image_name}"
   fi
 }