Fixes for removal of target

uniget-org · Dec 22, 2023 · d11fff6 · d11fff6
1 parent 0b30dd3
commit d11fff6
Show file tree

Hide file tree

Showing 51 changed files with 178 additions and 200 deletions.
diff --git a/tools/dagger/Dockerfile.template b/tools/dagger/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "dagger/dagger" "v${version}" "dagger_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/dagger/dagger/releases/download/v${version}/dagger_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 \
     dagger
 EOF
diff --git a/tools/dasel/Dockerfile.template b/tools/dasel/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "TomWright/dasel" "v${version}" "dasel_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/dasel" \
+curl --silent --location --fail --output "${prefix}/bin/dasel" \
     "https://github.com/TomWright/dasel/releases/download/v${version}/dasel_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/dasel"
+chmod +x "${prefix}/bin/dasel"
 EOF
diff --git a/tools/datree/Dockerfile.template b/tools/datree/Dockerfile.template
@@ -12,11 +12,11 @@ check-github-release-asset "datreeio/datree" "${version}" "datree-cli_${version}
 curl --silent --location --fail --remote-name "https://github.com/datreeio/datree/releases/download/${version}/datree-cli_${version}_Linux_${arch}.zip"
 unzip -q -o -d "/tmp" "datree-cli_${version}_Linux_${arch}.zip"
 rm "datree-cli_${version}_Linux_${arch}.zip"
-mv "/tmp/datree" "${prefix}${target}/bin"
-"${prefix}${target}/bin/datree" completion bash >"${prefix}${target}/share/bash-completion/completions/datree"
-"${prefix}${target}/bin/datree" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/datree.fish"
-"${prefix}${target}/bin/datree" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_datree"
+mv "/tmp/datree" "${prefix}/bin"
+"${prefix}/bin/datree" completion bash >"${prefix}/share/bash-completion/completions/datree"
+"${prefix}/bin/datree" completion fish >"${prefix}/share/fish/vendor_completions.d/datree.fish"
+"${prefix}/bin/datree" completion zsh >"${prefix}/share/zsh/vendor-completions/_datree"
 EOF
 RUN <<EOF
-"${prefix}${target}/bin/datree" config set offline local
+"${prefix}/bin/datree" config set offline local
 EOF
diff --git a/tools/dbui/Dockerfile.template b/tools/dbui/Dockerfile.template
@@ -12,6 +12,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "KenanBek/dbui" "v${version}" "dbui_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/KenanBek/dbui/releases/download/v${version}/dbui_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     dbui
 EOF
diff --git a/tools/ddosify/Dockerfile.template b/tools/ddosify/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ddosify/ddosify" "v${version}" "ddosify_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ddosify/ddosify/releases/download/v${version}/ddosify_${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 \
     ddosify
 EOF
diff --git a/tools/delta/Dockerfile.template b/tools/delta/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=rust / /
+COPY --from=rust / /usr/local
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 apt-get update
@@ -18,9 +18,10 @@ WORKDIR /tmp/github.com/dandavison/delta
 ARG name
 ARG version
 RUN <<EOF
-source "${target}/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/dandavison/delta .
+export CARGO_HOME=/usr/local/cargo
+export RUSTUP_HOME=/usr/local/rustup
 export RUSTFLAGS='-C target-feature=+crt-static'
 cargo build --release --target "${arch}-unknown-linux-gnu"
-cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}${target}/bin/"
+cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}/bin/"
 EOF
diff --git a/tools/dependency-check/Dockerfile.template b/tools/dependency-check/Dockerfile.template
@@ -12,7 +12,7 @@ check-github-release-asset "jeremylong/DependencyCheck" "v${version}" "dependenc
 url="https://github.com/jeremylong/DependencyCheck/releases/download/v${version}/dependency-check-${version}-release.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/opt" "${filename}"
-ln --symbolic --relative --force "${target}/opt/dependency-check/bin/dependency-check.sh" "${prefix}${target}/bin/dependency-check.sh"
-mv "${prefix}${target}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
+unzip -q -o -d "${prefix}/opt" "${filename}"
+ln --symbolic --relative --force "/opt/dependency-check/bin/dependency-check.sh" "${prefix}/bin/dependency-check.sh"
+mv "${prefix}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}/share/bash-completion/completions/dependency-check.sh"
 EOF
diff --git a/tools/depot/Dockerfile.template b/tools/depot/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "depot/cli" "v${version}" "depot_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/depot/cli/releases/download/v${version}/depot_${version}_linux_${alt_arch}.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 \
     bin/depot
 
-"${prefix}${target}/bin/depot" completion bash >"${prefix}${target}/share/bash-completion/completions/depot"
-"${prefix}${target}/bin/depot" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/depot.fish"
-"${prefix}${target}/bin/depot" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_depot"
+"${prefix}/bin/depot" completion bash >"${prefix}/share/bash-completion/completions/depot"
+"${prefix}/bin/depot" completion fish >"${prefix}/share/fish/vendor_completions.d/depot.fish"
+"${prefix}/bin/depot" completion zsh >"${prefix}/share/zsh/vendor-completions/_depot"
 EOF
diff --git a/tools/devbox/Dockerfile.template b/tools/devbox/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "jetpack-io/devbox" "${version}" "devbox_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jetpack-io/devbox/releases/download/${version}/devbox_${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
 
-"${prefix}${target}/bin/devbox" completion bash >"${prefix}${target}/share/bash-completion/completions/devbox"
-"${prefix}${target}/bin/devbox" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devbox.fish"
-"${prefix}${target}/bin/devbox" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devbox"
+"${prefix}/bin/devbox" completion bash >"${prefix}/share/bash-completion/completions/devbox"
+"${prefix}/bin/devbox" completion fish >"${prefix}/share/fish/vendor_completions.d/devbox.fish"
+"${prefix}/bin/devbox" completion zsh >"${prefix}/share/zsh/vendor-completions/_devbox"
 EOF
diff --git a/tools/devcontainer/Dockerfile.template b/tools/devcontainer/Dockerfile.template
@@ -21,12 +21,12 @@ apt-get update
 apt-get -y install --no-install-recommends \
     build-essential
 EOF
-WORKDIR ${prefix}${target}/libexec/devcontainer
+WORKDIR ${prefix}/libexec/devcontainer
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "@devcontainers/cli@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}/bin/"
 EOF
diff --git a/tools/devpod/Dockerfile.template b/tools/devpod/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "loft-sh/devpod" "v${version}" "devpod-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/devpod" \
+curl --silent --location --fail --output "${prefix}/bin/devpod" \
     "https://github.com/loft-sh/devpod/releases/download/v${version}/devpod-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/devpod"
+chmod +x "${prefix}/bin/devpod"
 
-"${prefix}${target}/bin/devpod" completion bash >"${prefix}${target}/share/bash-completion/completions/devpod"
-"${prefix}${target}/bin/devpod" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devpod.fish"
-"${prefix}${target}/bin/devpod" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devpod"
+"${prefix}/bin/devpod" completion bash >"${prefix}/share/bash-completion/completions/devpod"
+"${prefix}/bin/devpod" completion fish >"${prefix}/share/fish/vendor_completions.d/devpod.fish"
+"${prefix}/bin/devpod" completion zsh >"${prefix}/share/zsh/vendor-completions/_devpod"
 EOF
diff --git a/tools/diffoci/Dockerfile.template b/tools/diffoci/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "reproducible-containers/diffoci" "v${version}" "diffoci-v${version}.linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/diffoci" \
+curl --silent --location --fail --output "${prefix}/bin/diffoci" \
     "https://github.com/reproducible-containers/diffoci/releases/download/v${version}/diffoci-v${version}.linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/diffoci"
+chmod +x "${prefix}/bin/diffoci"
 
-"${prefix}${target}/bin/diffoci" completion bash >"${prefix}${target}/share/bash-completion/completions/diffoci"
-"${prefix}${target}/bin/diffoci" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/diffoci.fish"
-"${prefix}${target}/bin/diffoci" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_diffoci"
+"${prefix}/bin/diffoci" completion bash >"${prefix}/share/bash-completion/completions/diffoci"
+"${prefix}/bin/diffoci" completion fish >"${prefix}/share/fish/vendor_completions.d/diffoci.fish"
+"${prefix}/bin/diffoci" completion zsh >"${prefix}/share/zsh/vendor-completions/_diffoci"
 EOF
diff --git a/tools/dinit/Dockerfile.template b/tools/dinit/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 # check-github-release-asset "foo/bar" "${version}" "foo-${version}-linux-amd64.tar.gz"
-curl --silent --location --fail --output "${prefix}${target}/bin/dinit" \
+curl --silent --location --fail --output "${prefix}/bin/dinit" \
     "https://gitlab.com/tozd/dinit/-/releases/v${version}/downloads/linux-${alt_arch}/dinit"
-chmod +x "${prefix}${target}/bin/dinit"
+chmod +x "${prefix}/bin/dinit"
 EOF
diff --git a/tools/direnv/Dockerfile.template b/tools/direnv/Dockerfile.template
@@ -9,17 +9,19 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "direnv/direnv" "v${version}" "direnv.linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/direnv" \
+curl --silent --location --fail --output "${prefix}/bin/direnv" \
     "https://github.com/direnv/direnv/releases/download/v${version}/direnv.linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/direnv"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-fetchurl.1" \
+chmod +x "${prefix}/bin/direnv"
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-fetchurl.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv-fetchurl.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-stdlib.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-stdlib.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv-stdlib.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.toml.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.toml.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv.toml.1"
-EOF
 
-COPY direnv.sh ${prefix}/etc/profile.d/
+cat <<EOF >"${prefix}/etc/profile.d/direnv.sh"
+#!/bin/bash
+eval "\$(direnv hook bash)"
+EOF
diff --git a/tools/direnv/direnv.sh b/tools/direnv/direnv.sh
diff --git a/tools/distrobox/Dockerfile.template b/tools/distrobox/Dockerfile.template
@@ -9,17 +9,17 @@ ARG name
 ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/89luca89/distrobox/archive/refs/tags/${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner --strip-components=1 --wildcards \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner --strip-components=1 --wildcards \
     "distrobox-${version}/distrobox-*" \
     "distrobox-${version}/man" \
     "distrobox-${version}/completions" \
     "distrobox-${version}/terminal-distrobox-icon.svg"
 
-mv "${prefix}${target}/bin/man/man1" "${prefix}${target}/share/man/"
-rm -rf "${prefix}${target}/bin/man/"
+mv "${prefix}/bin/man/man1" "${prefix}/share/man/"
+rm -rf "${prefix}/bin/man/"
 
-mv "${prefix}${target}/bin/completions" "${prefix}${target}/share/bash-completion/"
+mv "${prefix}/bin/completions" "${prefix}/share/bash-completion/"
 
-mkdir -p "${prefix}${target}/share/icons/"
-mv "${prefix}${target}/bin/terminal-distrobox-icon.svg" "${prefix}${target}/share/icons/"
+mkdir -p "${prefix}/share/icons/"
+mv "${prefix}/bin/terminal-distrobox-icon.svg" "${prefix}/share/icons/"
 EOF
diff --git a/tools/diun/Dockerfile.template b/tools/diun/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "crazy-max/diun" "v${version}" "diun_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/crazy-max/diun/releases/download/v${version}/diun_${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 \
     ./diun
 EOF
diff --git a/tools/dive/Dockerfile.template b/tools/dive/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "wagoodman/dive" "v${version}" "dive_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/wagoodman/dive/releases/download/v${version}/dive_${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 \
     dive
 EOF
diff --git a/tools/dnsx/Dockerfile.template b/tools/dnsx/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "projectdiscovery/dnsx" "v${version}" "dnsx_${version
 url="https://github.com/projectdiscovery/dnsx/releases/download/v${version}/dnsx_${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}" \
     dnsx
 EOF
diff --git a/tools/docker-base/Dockerfile.template b/tools/docker-base/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker/base-cli-plugin" "v${version}" "base-cli-plugin_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/base-cli-plugin/releases/download/v${version}/base-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins" --no-same-owner \
     docker-base
 EOF
diff --git a/tools/docker-compose-switch/Dockerfile.template b/tools/docker-compose-switch/Dockerfile.template
@@ -9,9 +9,9 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "docker/compose-switch" "v${version}" "docker-compose-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose-switch" \
+curl --silent --location --fail --output "${prefix}/bin/docker-compose-switch" \
     "https://github.com/docker/compose-switch/releases/download/v${version}/docker-compose-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/docker-compose-switch"
+chmod +x "${prefix}/bin/docker-compose-switch"
 
-ln --symbolic --relative --force "${prefix}${target}/bin/docker-compose-switch" "${prefix}${target}/bin/docker-compose"
+ln --symbolic --relative --force "${prefix}/bin/docker-compose-switch" "${prefix}/bin/docker-compose"
 EOF
diff --git a/tools/docker-compose-v1/Dockerfile.template b/tools/docker-compose-v1/Dockerfile.template
@@ -1,12 +1,15 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM --platform=amd64 ghcr.io/uniget-org/tools/base:latest AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY docker-compose-cli-plugin ${prefix}${target}/libexec/docker/cli-plugins/docker-compose
 RUN <<EOF
 check-github-release-asset "docker/compose" "${version}" "docker-compose-Linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose" \
+curl --silent --location --fail --output "${prefix}/bin/docker-compose" \
     "https://github.com/docker/compose/releases/download/${version}/docker-compose-Linux-${arch}"
-chmod +x "${prefix}${target}/bin/docker-compose"
+chmod +x "${prefix}/bin/docker-compose"
 EOF
diff --git a/tools/docker-compose-v1/docker-compose-cli-plugin b/tools/docker-compose-v1/docker-compose-cli-plugin
diff --git a/tools/docker-compose/Dockerfile.template b/tools/docker-compose/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "docker/compose" "v${version}" "docker-compose-linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-compose" \
+curl --silent --location --fail --output "${prefix}/libexec/docker/cli-plugins/docker-compose" \
     "https://github.com/docker/compose/releases/download/v${version}/docker-compose-linux-${arch}"
-chmod +x "${prefix}${target}/libexec/docker/cli-plugins/docker-compose"
+chmod +x "${prefix}/libexec/docker/cli-plugins/docker-compose"
 EOF
diff --git a/tools/docker-credential-acr-env/Dockerfile.template b/tools/docker-credential-acr-env/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "chrismellard/docker-credential-acr-env" "${version}" "docker-credential-acr-env_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/chrismellard/docker-credential-acr-env/releases/download/${version}/docker-credential-acr-env_${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 \
     docker-credential-acr-env
 EOF
diff --git a/tools/docker-credential-ecr-login/Dockerfile.template b/tools/docker-credential-ecr-login/Dockerfile.template
@@ -10,7 +10,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-credential-ecr-login" \
+curl --silent --location --fail --output "${prefix}/bin/docker-credential-ecr-login" \
     "https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${version}/linux-${alt_arch}/docker-credential-ecr-login"
-chmod +x "${prefix}${target}/bin/docker-credential-ecr-login"
+chmod +x "${prefix}/bin/docker-credential-ecr-login"
 EOF
diff --git a/tools/docker-credential-gcr/Dockerfile.template b/tools/docker-credential-gcr/Dockerfile.template
@@ -11,6 +11,6 @@ ARG version
 
 RUN <<EOF
 curl --silent --location --fail "https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v${version}/docker-credential-gcr_linux_${alt_arch}-${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     docker-credential-gcr
 EOF