Removed target var #2213

tools/cadvisor/Dockerfile.template

@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "google/cadvisor" "v${version}" "cadvisor-v${version}-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cadvisor" \
+curl --silent --location --fail --output "${prefix}/bin/cadvisor" \
     "https://github.com/google/cadvisor/releases/download/v${version}/cadvisor-v${version}-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cadvisor"
+chmod +x "${prefix}/bin/cadvisor"
 EOF

tools/calicoctl/Dockerfile.template

@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "projectcalico/calico" "v${version}" "calicoctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/calicoctl" \
+curl --silent --location --fail --output "${prefix}/bin/calicoctl" \
     "https://github.com/projectcalico/calico/releases/download/v${version}/calicoctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/calicoctl"
+chmod +x "${prefix}/bin/calicoctl"
 EOF

tools/car/Dockerfile.template

@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "tetratelabs/car" "v${version}" "car_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/tetratelabs/car/releases/download/v${version}/car_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 EOF

tools/cas/Dockerfile.template

@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "codenotary/cas" "v${version}" "cas-v${version}-linux-${alt_arch}-static"
-curl --silent --location --fail --output "${prefix}${target}/bin/cas" \
+curl --silent --location --fail --output "${prefix}/bin/cas" \
     "https://github.com/codenotary/cas/releases/download/v${version}/cas-v${version}-linux-${alt_arch}-static"
-chmod +x "${prefix}${target}/bin/cas"
-"${prefix}${target}/bin/cas" completion bash >"${prefix}${target}/share/bash-completion/completions/cas"
-"${prefix}${target}/bin/cas" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cas.fish"
-"${prefix}${target}/bin/cas" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cas"
+chmod +x "${prefix}/bin/cas"
+"${prefix}/bin/cas" completion bash >"${prefix}/share/bash-completion/completions/cas"
+"${prefix}/bin/cas" completion fish >"${prefix}/share/fish/vendor_completions.d/cas.fish"
+"${prefix}/bin/cas" completion zsh >"${prefix}/share/zsh/vendor-completions/_cas"
 EOF

tools/cascadia-code/Dockerfile.template

@@ -13,8 +13,8 @@ url="https://github.com/microsoft/cascadia-code/releases/download/v${version}/Ca
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
 mkdir -p \
-    "${prefix}${target}/share/cascadia-code" \
-    "${prefix}${target}/share/fonts/cascadia-code"
-unzip -q -o -d "${prefix}${target}/share/cascadia-code/" "${filename}"
-find "${prefix}${target}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}${target}/share/fonts/cascadia-code" \;
+    "${prefix}/share/cascadia-code" \
+    "${prefix}/share/fonts/cascadia-code"
+unzip -q -o -d "${prefix}/share/cascadia-code/" "${filename}"
+find "${prefix}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}/share/fonts/cascadia-code" \;
 EOF

tools/catatonit/Dockerfile.template

@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "openSUSE/catatonit" "v${version}" "catatonit.${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/catatonit" \
+curl --silent --location --fail --output "${prefix}/bin/catatonit" \
     "https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.${arch}"
-chmod +x "${prefix}${target}/bin/catatonit"
+chmod +x "${prefix}/bin/catatonit"
 EOF

tools/cdebug/Dockerfile.template

@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "iximiuz/cdebug" "v${version}" "cdebug_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/iximiuz/cdebug/releases/download/v${version}/cdebug_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cdebug
 
-"${prefix}${target}/bin/cdebug" completion bash >"${prefix}${target}/share/bash-completion/completions/cdebug"
-"${prefix}${target}/bin/cdebug" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cdebug.fish"
-"${prefix}${target}/bin/cdebug" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cdebug"
+"${prefix}/bin/cdebug" completion bash >"${prefix}/share/bash-completion/completions/cdebug"
+"${prefix}/bin/cdebug" completion fish >"${prefix}/share/fish/vendor_completions.d/cdebug.fish"
+"${prefix}/bin/cdebug" completion zsh >"${prefix}/share/zsh/vendor-completions/_cdebug"
 EOF

tools/cdncheck/Dockerfile.template

@@ -13,13 +13,13 @@ check-github-release-asset "projectdiscovery/cdncheck" "v${version}" "cdncheck_$
 url="https://github.com/projectdiscovery/cdncheck/releases/download/v${version}/cdncheck_${version}_linux_${alt_arch}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}" \
+unzip -q -o -d "${prefix}/bin" "${filename}" \
     cdncheck
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
+#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo"
+#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish"
+#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo"
 #EOF

tools/cdxgen/Dockerfile.template

@@ -12,12 +12,12 @@ ARG name
 ARG version
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/cdxgen
+WORKDIR ${prefix}/libexec/cdxgen
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "@cyclonedx/cdxgen@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}/bin/"
 EOF

tools/cfssl/Dockerfile.template

@@ -11,8 +11,8 @@ ARG BINARIES="cfssl-bundle cfssl-certinfo cfssl-newkey cfssl-scan cfssljson cfss
 RUN <<EOF
 for BINARY in ${BINARIES}; do
     check-github-release-asset "cloudflare/cfssl" "v${version}" "${BINARY}_${version}_linux_amd64"
-    curl --silent --location --fail --output "${prefix}${target}/bin/${BINARY}" \
+    curl --silent --location --fail --output "${prefix}/bin/${BINARY}" \
         "https://github.com/cloudflare/cfssl/releases/download/v${version}/${BINARY}_${version}_linux_amd64"
-    chmod +x "${prefix}${target}/bin/${BINARY}"
+    chmod +x "${prefix}/bin/${BINARY}"
 done
 EOF

tools/chart-releaser/Dockerfile.template

@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "helm/chart-releaser" "v${version}" "chart-releaser_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-releaser/releases/download/v${version}/chart-releaser_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cr
 
-"${prefix}${target}/bin/cr" completion bash >"${prefix}${target}/share/bash-completion/completions/cr"
-"${prefix}${target}/bin/cr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cr.fish"
-"${prefix}${target}/bin/cr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cr"
+"${prefix}/bin/cr" completion bash >"${prefix}/share/bash-completion/completions/cr"
+"${prefix}/bin/cr" completion fish >"${prefix}/share/fish/vendor_completions.d/cr.fish"
+"${prefix}/bin/cr" completion zsh >"${prefix}/share/zsh/vendor-completions/_cr"
 EOF

tools/chart-testing/Dockerfile.template

@@ -10,15 +10,15 @@ ARG version
 RUN <<EOF
 check-github-release-asset "helm/chart-testing" "v${version}" "chart-testing_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-testing/releases/download/v${version}/chart-testing_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     ct \
     etc
 mkdir -p "${prefix}/etc/ct"
-mv "${prefix}${target}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
-mv "${prefix}${target}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
-rmdir "${prefix}${target}/bin/etc"
+mv "${prefix}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
+mv "${prefix}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
+rmdir "${prefix}/bin/etc"
 
-"${prefix}${target}/bin/ct" completion bash >"${prefix}${target}/share/bash-completion/completions/ct"
-"${prefix}${target}/bin/ct" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/ct.fish"
-"${prefix}${target}/bin/ct" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_ct"
+"${prefix}/bin/ct" completion bash >"${prefix}/share/bash-completion/completions/ct"
+"${prefix}/bin/ct" completion fish >"${prefix}/share/fish/vendor_completions.d/ct.fish"
+"${prefix}/bin/ct" completion zsh >"${prefix}/share/zsh/vendor-completions/_ct"
 EOF

tools/cheat/Dockerfile.template

@@ -11,9 +11,9 @@ RUN <<EOF
 check-github-release-asset "cheat/cheat" "${version}" "cheat-linux-${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/cheat/cheat/releases/download/${version}/cheat-linux-${alt_arch}.gz" \
 | gunzip \
->"${prefix}${target}/bin/cheat"
-chmod +x "${prefix}${target}/bin/cheat"
+>"${prefix}/bin/cheat"
+chmod +x "${prefix}/bin/cheat"
 
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/cheat.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/cheat.1" \
     "https://github.com/cheat/cheat/raw/${version}/doc/cheat.1"
 EOF

tools/checkov/Dockerfile.template

@@ -19,5 +19,5 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/checkov" --console-script checkov "checkov==${version}"
+shiv --output-file "${prefix}/bin/checkov" --console-script checkov "checkov==${version}"
 EOF

tools/chekr/Dockerfile.template

@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ckotzbauer/chekr" "${version}" "chekr_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ckotzbauer/chekr/releases/download/${version}/chekr_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     chekr
-"${prefix}${target}/bin/chekr" completion bash >"${prefix}${target}/share/bash-completion/completions/chekr"
-"${prefix}${target}/bin/chekr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/chekr.fish"
-"${prefix}${target}/bin/chekr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_chekr"
+"${prefix}/bin/chekr" completion bash >"${prefix}/share/bash-completion/completions/chekr"
+"${prefix}/bin/chekr" completion fish >"${prefix}/share/fish/vendor_completions.d/chekr.fish"
+"${prefix}/bin/chekr" completion zsh >"${prefix}/share/zsh/vendor-completions/_chekr"
 EOF

tools/chigo/Dockerfile.template

@@ -10,7 +10,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "UltiRequiem/chigo" "v${version}" "chigo_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/UltiRequiem/chigo/releases/download/v${version}/chigo_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     chigo
-ln --symbolic --relative --force chigo "${prefix}${target}/bin/lolcat"
+ln --symbolic --relative --force chigo "${prefix}/bin/lolcat"
 EOF

tools/chisel/Dockerfile.template

@@ -11,6 +11,6 @@ RUN <<EOF
 check-github-release-asset "jpillora/chisel" "v${version}" "chisel_${version}_linux_${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/jpillora/chisel/releases/download/v${version}/chisel_${version}_linux_${alt_arch}.gz" \
 | gunzip \
->"${prefix}${target}/bin/chisel"
-chmod +x "${prefix}${target}/bin/chisel"
+>"${prefix}/bin/chisel"
+chmod +x "${prefix}/bin/chisel"
 EOF

tools/cilium/Dockerfile.template

@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cilium/cilium-cli" "v${version}" "cilium-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cilium/cilium-cli/releases/download/v${version}/cilium-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
-"${prefix}${target}/bin/cilium" completion bash >"${prefix}${target}/share/bash-completion/completions/cilium"
-"${prefix}${target}/bin/cilium" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cilium.fish"
-"${prefix}${target}/bin/cilium" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cilium"
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner
+"${prefix}/bin/cilium" completion bash >"${prefix}/share/bash-completion/completions/cilium"
+"${prefix}/bin/cilium" completion fish >"${prefix}/share/fish/vendor_completions.d/cilium.fish"
+"${prefix}/bin/cilium" completion zsh >"${prefix}/share/zsh/vendor-completions/_cilium"
 EOF

tools/cinf/Dockerfile.template

@@ -12,6 +12,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "mhausenblas/cinf" "v${version}" "cinf_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/mhausenblas/cinf/releases/download/v${version}/cinf_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     cinf
 EOF

tools/click/Dockerfile.template

@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "databricks/click" "v${version}" "click-v${version}-x86_64-unknown-linux-musl.tar.gz"
 curl --silent --location --fail "https://github.com/databricks/click/releases/download/v${version}/click-v${version}-x86_64-unknown-linux-musl.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     click-v${version}-x86_64-unknown-linux-musl/click
 EOF

tools/cloudflared/Dockerfile.template

@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "cloudflare/cloudflared" "${version}" "cloudflared-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cloudflared" \
+curl --silent --location --fail --output "${prefix}/bin/cloudflared" \
     "https://github.com/cloudflare/cloudflared/releases/download/${version}/cloudflared-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cloudflared"
+chmod +x "${prefix}/bin/cloudflared"
 EOF

tools/clusterawsadm/Dockerfile.template

@@ -11,10 +11,10 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/cluster-api-provider-aws" "v${version}" "clusterawsadm-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/clusterawsadm" \
+curl --silent --location --fail --output "${prefix}/bin/clusterawsadm" \
     "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v${version}/clusterawsadm-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/clusterawsadm"
-"${prefix}${target}/bin/clusterawsadm" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterawsadm"
-"${prefix}${target}/bin/clusterawsadm" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/clusterawsadm.fish"
-"${prefix}${target}/bin/clusterawsadm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterawsadm"
+chmod +x "${prefix}/bin/clusterawsadm"
+"${prefix}/bin/clusterawsadm" completion bash >"${prefix}/share/bash-completion/completions/clusterawsadm"
+"${prefix}/bin/clusterawsadm" completion fish >"${prefix}/share/fish/vendor_completions.d/clusterawsadm.fish"
+"${prefix}/bin/clusterawsadm" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterawsadm"
 EOF

tools/clusterctl/Dockerfile.template

@@ -9,9 +9,9 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/cluster-api" "v${version}" "clusterctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/clusterctl" \
+curl --silent --location --fail --output "${prefix}/bin/clusterctl" \
     "https://github.com/kubernetes-sigs/cluster-api/releases/download/v${version}/clusterctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/clusterctl"
-"${prefix}${target}/bin/clusterctl" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterctl"
-"${prefix}${target}/bin/clusterctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterctl"
+chmod +x "${prefix}/bin/clusterctl"
+"${prefix}/bin/clusterctl" completion bash >"${prefix}/share/bash-completion/completions/clusterctl"
+"${prefix}/bin/clusterctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterctl"
 EOF

tools/clusterlint/Dockerfile.template

@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "digitalocean/clusterlint" "v${version}" "clusterlint-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/digitalocean/clusterlint/releases/download/v${version}/clusterlint-v${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 EOF

tools/cmctl/Dockerfile.template

@@ -10,15 +10,15 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cert-manager/cert-manager" "v${version}" "cmctl-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cert-manager/cert-manager/releases/download/v${version}/cmctl-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     cmctl
 
 check-github-release-asset "cert-manager/cert-manager" "v${version}" "kubectl-cert_manager-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cert-manager/cert-manager/releases/download/v${version}/kubectl-cert_manager-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubectl-cert_manager
 
-"${prefix}${target}/bin/cmctl" completion bash >"${prefix}${target}/share/bash-completion/completions/cmctl"
-"${prefix}${target}/bin/cmctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cmctl.fish"
-"${prefix}${target}/bin/cmctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cmctl"
+"${prefix}/bin/cmctl" completion bash >"${prefix}/share/bash-completion/completions/cmctl"
+"${prefix}/bin/cmctl" completion fish >"${prefix}/share/fish/vendor_completions.d/cmctl.fish"
+"${prefix}/bin/cmctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_cmctl"
 EOF