Removed target var #2213

Author: nicholasdille

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