Skip to content

Commit 518ea3d

Browse files
nicholasdillenicholasdille
committed
Fixes for removal of target
1 parent 7c09beb commit 518ea3d

File tree

51 files changed

+178
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+178
-200
lines changed

‎tools/dagger/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "dagger/dagger" "v${version}" "dagger_v${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/dagger/dagger/releases/download/v${version}/dagger_v${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1414
dagger
1515
EOF

‎tools/dasel/Dockerfile.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG version
1111

1212
RUN <<EOF
1313
check-github-release-asset "TomWright/dasel" "v${version}" "dasel_linux_${alt_arch}"
14-
curl --silent --location --fail --output "${prefix}${target}/bin/dasel" \
14+
curl --silent --location --fail --output "${prefix}/bin/dasel" \
1515
"https://github.com/TomWright/dasel/releases/download/v${version}/dasel_linux_${alt_arch}"
16-
chmod +x "${prefix}${target}/bin/dasel"
16+
chmod +x "${prefix}/bin/dasel"
1717
EOF

‎tools/datree/Dockerfile.template

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ check-github-release-asset "datreeio/datree" "${version}" "datree-cli_${version}
1212
curl --silent --location --fail --remote-name "https://github.com/datreeio/datree/releases/download/${version}/datree-cli_${version}_Linux_${arch}.zip"
1313
unzip -q -o -d "/tmp" "datree-cli_${version}_Linux_${arch}.zip"
1414
rm "datree-cli_${version}_Linux_${arch}.zip"
15-
mv "/tmp/datree" "${prefix}${target}/bin"
16-
"${prefix}${target}/bin/datree" completion bash >"${prefix}${target}/share/bash-completion/completions/datree"
17-
"${prefix}${target}/bin/datree" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/datree.fish"
18-
"${prefix}${target}/bin/datree" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_datree"
15+
mv "/tmp/datree" "${prefix}/bin"
16+
"${prefix}/bin/datree" completion bash >"${prefix}/share/bash-completion/completions/datree"
17+
"${prefix}/bin/datree" completion fish >"${prefix}/share/fish/vendor_completions.d/datree.fish"
18+
"${prefix}/bin/datree" completion zsh >"${prefix}/share/zsh/vendor-completions/_datree"
1919
EOF
2020
RUN <<EOF
21-
"${prefix}${target}/bin/datree" config set offline local
21+
"${prefix}/bin/datree" config set offline local
2222
EOF

‎tools/dbui/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ ARG version
1212
RUN <<EOF
1313
check-github-release-asset "KenanBek/dbui" "v${version}" "dbui_Linux_${arch}.tar.gz"
1414
curl --silent --location --fail "https://github.com/KenanBek/dbui/releases/download/v${version}/dbui_Linux_${arch}.tar.gz" \
15-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
15+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1616
dbui
1717
EOF

‎tools/ddosify/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "ddosify/ddosify" "v${version}" "ddosify_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/ddosify/ddosify/releases/download/v${version}/ddosify_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
1414
ddosify
1515
EOF

‎tools/delta/Dockerfile.template

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
77
/etc/profile.d/ \
88
/etc/profile.d/
99
SHELL [ "bash", "-clo", "errexit" ]
10-
COPY --from=rust / /
10+
COPY --from=rust / /usr/local
1111
ARG DEBIAN_FRONTEND=noninteractive
1212
RUN <<EOF
1313
apt-get update
@@ -18,9 +18,10 @@ WORKDIR /tmp/github.com/dandavison/delta
1818
ARG name
1919
ARG version
2020
RUN <<EOF
21-
source "${target}/etc/profile.d/cargo.sh"
2221
git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/dandavison/delta .
22+
export CARGO_HOME=/usr/local/cargo
23+
export RUSTUP_HOME=/usr/local/rustup
2324
export RUSTFLAGS='-C target-feature=+crt-static'
2425
cargo build --release --target "${arch}-unknown-linux-gnu"
25-
cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}${target}/bin/"
26+
cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}/bin/"
2627
EOF

‎tools/dependency-check/Dockerfile.template

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ check-github-release-asset "jeremylong/DependencyCheck" "v${version}" "dependenc
1212
url="https://github.com/jeremylong/DependencyCheck/releases/download/v${version}/dependency-check-${version}-release.zip"
1313
filename="$(basename "${url}")"
1414
curl --silent --location --fail --remote-name "${url}"
15-
unzip -q -o -d "${prefix}${target}/opt" "${filename}"
16-
ln --symbolic --relative --force "${target}/opt/dependency-check/bin/dependency-check.sh" "${prefix}${target}/bin/dependency-check.sh"
17-
mv "${prefix}${target}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
15+
unzip -q -o -d "${prefix}/opt" "${filename}"
16+
ln --symbolic --relative --force "/opt/dependency-check/bin/dependency-check.sh" "${prefix}/bin/dependency-check.sh"
17+
mv "${prefix}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}/share/bash-completion/completions/dependency-check.sh"
1818
EOF

‎tools/depot/Dockerfile.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "depot/cli" "v${version}" "depot_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/depot/cli/releases/download/v${version}/depot_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
1414
bin/depot
1515

16-
"${prefix}${target}/bin/depot" completion bash >"${prefix}${target}/share/bash-completion/completions/depot"
17-
"${prefix}${target}/bin/depot" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/depot.fish"
18-
"${prefix}${target}/bin/depot" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_depot"
16+
"${prefix}/bin/depot" completion bash >"${prefix}/share/bash-completion/completions/depot"
17+
"${prefix}/bin/depot" completion fish >"${prefix}/share/fish/vendor_completions.d/depot.fish"
18+
"${prefix}/bin/depot" completion zsh >"${prefix}/share/zsh/vendor-completions/_depot"
1919
EOF

‎tools/devbox/Dockerfile.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "jetpack-io/devbox" "${version}" "devbox_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/jetpack-io/devbox/releases/download/${version}/devbox_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
13+
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
1414

15-
"${prefix}${target}/bin/devbox" completion bash >"${prefix}${target}/share/bash-completion/completions/devbox"
16-
"${prefix}${target}/bin/devbox" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devbox.fish"
17-
"${prefix}${target}/bin/devbox" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devbox"
15+
"${prefix}/bin/devbox" completion bash >"${prefix}/share/bash-completion/completions/devbox"
16+
"${prefix}/bin/devbox" completion fish >"${prefix}/share/fish/vendor_completions.d/devbox.fish"
17+
"${prefix}/bin/devbox" completion zsh >"${prefix}/share/zsh/vendor-completions/_devbox"
1818
EOF

‎tools/devcontainer/Dockerfile.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ apt-get update
2121
apt-get -y install --no-install-recommends \
2222
build-essential
2323
EOF
24-
WORKDIR ${prefix}${target}/libexec/devcontainer
24+
WORKDIR ${prefix}/libexec/devcontainer
2525
ARG name
2626
ARG version
2727
RUN <<EOF
2828
npm install \
2929
--omit=dev \
3030
"@devcontainers/cli@${version}"
31-
ln --symbolic --relative --force "${prefix}${target}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}${target}/bin/"
31+
ln --symbolic --relative --force "${prefix}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}/bin/"
3232
EOF

‎tools/devpod/Dockerfile.template

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
check-github-release-asset "loft-sh/devpod" "v${version}" "devpod-linux-${alt_arch}"
12-
curl --silent --location --fail --output "${prefix}${target}/bin/devpod" \
12+
curl --silent --location --fail --output "${prefix}/bin/devpod" \
1313
"https://github.com/loft-sh/devpod/releases/download/v${version}/devpod-linux-${alt_arch}"
14-
chmod +x "${prefix}${target}/bin/devpod"
14+
chmod +x "${prefix}/bin/devpod"
1515

16-
"${prefix}${target}/bin/devpod" completion bash >"${prefix}${target}/share/bash-completion/completions/devpod"
17-
"${prefix}${target}/bin/devpod" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devpod.fish"
18-
"${prefix}${target}/bin/devpod" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devpod"
16+
"${prefix}/bin/devpod" completion bash >"${prefix}/share/bash-completion/completions/devpod"
17+
"${prefix}/bin/devpod" completion fish >"${prefix}/share/fish/vendor_completions.d/devpod.fish"
18+
"${prefix}/bin/devpod" completion zsh >"${prefix}/share/zsh/vendor-completions/_devpod"
1919
EOF

‎tools/diffoci/Dockerfile.template

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
check-github-release-asset "reproducible-containers/diffoci" "v${version}" "diffoci-v${version}.linux-${alt_arch}"
12-
curl --silent --location --fail --output "${prefix}${target}/bin/diffoci" \
12+
curl --silent --location --fail --output "${prefix}/bin/diffoci" \
1313
"https://github.com/reproducible-containers/diffoci/releases/download/v${version}/diffoci-v${version}.linux-${alt_arch}"
14-
chmod +x "${prefix}${target}/bin/diffoci"
14+
chmod +x "${prefix}/bin/diffoci"
1515

16-
"${prefix}${target}/bin/diffoci" completion bash >"${prefix}${target}/share/bash-completion/completions/diffoci"
17-
"${prefix}${target}/bin/diffoci" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/diffoci.fish"
18-
"${prefix}${target}/bin/diffoci" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_diffoci"
16+
"${prefix}/bin/diffoci" completion bash >"${prefix}/share/bash-completion/completions/diffoci"
17+
"${prefix}/bin/diffoci" completion fish >"${prefix}/share/fish/vendor_completions.d/diffoci.fish"
18+
"${prefix}/bin/diffoci" completion zsh >"${prefix}/share/zsh/vendor-completions/_diffoci"
1919
EOF

‎tools/dinit/Dockerfile.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
# check-github-release-asset "foo/bar" "${version}" "foo-${version}-linux-amd64.tar.gz"
12-
curl --silent --location --fail --output "${prefix}${target}/bin/dinit" \
12+
curl --silent --location --fail --output "${prefix}/bin/dinit" \
1313
"https://gitlab.com/tozd/dinit/-/releases/v${version}/downloads/linux-${alt_arch}/dinit"
14-
chmod +x "${prefix}${target}/bin/dinit"
14+
chmod +x "${prefix}/bin/dinit"
1515
EOF

‎tools/direnv/Dockerfile.template

+10-8
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
check-github-release-asset "direnv/direnv" "v${version}" "direnv.linux-${alt_arch}"
12-
curl --silent --location --fail --output "${prefix}${target}/bin/direnv" \
12+
curl --silent --location --fail --output "${prefix}/bin/direnv" \
1313
"https://github.com/direnv/direnv/releases/download/v${version}/direnv.linux-${alt_arch}"
14-
chmod +x "${prefix}${target}/bin/direnv"
15-
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-fetchurl.1" \
14+
chmod +x "${prefix}/bin/direnv"
15+
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-fetchurl.1" \
1616
"https://github.com/direnv/direnv/raw/v${version}/man/direnv-fetchurl.1"
17-
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-stdlib.1" \
17+
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-stdlib.1" \
1818
"https://github.com/direnv/direnv/raw/v${version}/man/direnv-stdlib.1"
19-
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.1" \
19+
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.1" \
2020
"https://github.com/direnv/direnv/raw/v${version}/man/direnv.1"
21-
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.toml.1" \
21+
curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.toml.1" \
2222
"https://github.com/direnv/direnv/raw/v${version}/man/direnv.toml.1"
23-
EOF
2423

25-
COPY direnv.sh ${prefix}/etc/profile.d/
24+
cat <<EOF >"${prefix}/etc/profile.d/direnv.sh"
25+
#!/bin/bash
26+
eval "\$(direnv hook bash)"
27+
EOF

‎tools/direnv/direnv.sh

-3
This file was deleted.

‎tools/distrobox/Dockerfile.template

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
curl --silent --location --fail "https://github.com/89luca89/distrobox/archive/refs/tags/${version}.tar.gz" \
12-
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner --strip-components=1 --wildcards \
12+
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner --strip-components=1 --wildcards \
1313
"distrobox-${version}/distrobox-*" \
1414
"distrobox-${version}/man" \
1515
"distrobox-${version}/completions" \
1616
"distrobox-${version}/terminal-distrobox-icon.svg"
1717

18-
mv "${prefix}${target}/bin/man/man1" "${prefix}${target}/share/man/"
19-
rm -rf "${prefix}${target}/bin/man/"
18+
mv "${prefix}/bin/man/man1" "${prefix}/share/man/"
19+
rm -rf "${prefix}/bin/man/"
2020

21-
mv "${prefix}${target}/bin/completions" "${prefix}${target}/share/bash-completion/"
21+
mv "${prefix}/bin/completions" "${prefix}/share/bash-completion/"
2222

23-
mkdir -p "${prefix}${target}/share/icons/"
24-
mv "${prefix}${target}/bin/terminal-distrobox-icon.svg" "${prefix}${target}/share/icons/"
23+
mkdir -p "${prefix}/share/icons/"
24+
mv "${prefix}/bin/terminal-distrobox-icon.svg" "${prefix}/share/icons/"
2525
EOF

‎tools/diun/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "crazy-max/diun" "v${version}" "diun_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/crazy-max/diun/releases/download/v${version}/diun_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1414
./diun
1515
EOF

‎tools/dive/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "wagoodman/dive" "v${version}" "dive_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/wagoodman/dive/releases/download/v${version}/dive_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1414
dive
1515
EOF

‎tools/dnsx/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ check-github-release-asset "projectdiscovery/dnsx" "v${version}" "dnsx_${version
1212
url="https://github.com/projectdiscovery/dnsx/releases/download/v${version}/dnsx_${version}_linux_${alt_arch}.zip"
1313
filename="$(basename "${url}")"
1414
curl --silent --location --fail --remote-name "${url}"
15-
unzip -q -o -d "${prefix}${target}/bin" "${filename}" \
15+
unzip -q -o -d "${prefix}/bin" "${filename}" \
1616
dnsx
1717
EOF

‎tools/docker-base/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "docker/base-cli-plugin" "v${version}" "base-cli-plugin_${version}_linux_${alt_arch}.tar.gz"
1212
curl --silent --location --fail "https://github.com/docker/base-cli-plugin/releases/download/v${version}/base-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
13-
| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins" --no-same-owner \
1414
docker-base
1515
EOF

‎tools/docker-compose-switch/Dockerfile.template

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
check-github-release-asset "docker/compose-switch" "v${version}" "docker-compose-linux-${alt_arch}"
12-
curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose-switch" \
12+
curl --silent --location --fail --output "${prefix}/bin/docker-compose-switch" \
1313
"https://github.com/docker/compose-switch/releases/download/v${version}/docker-compose-linux-${alt_arch}"
14-
chmod +x "${prefix}${target}/bin/docker-compose-switch"
14+
chmod +x "${prefix}/bin/docker-compose-switch"
1515

16-
ln --symbolic --relative --force "${prefix}${target}/bin/docker-compose-switch" "${prefix}${target}/bin/docker-compose"
16+
ln --symbolic --relative --force "${prefix}/bin/docker-compose-switch" "${prefix}/bin/docker-compose"
1717
EOF

‎tools/docker-compose-v1/Dockerfile.template

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
#syntax=docker/dockerfile:1.6.0
22

3-
FROM --platform=amd64 ghcr.io/uniget-org/tools/base:latest AS prepare
3+
FROM nicholasdille/ubuntu:22.04 AS prepare
4+
COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
5+
/etc/profile.d/ \
6+
/etc/profile.d/
7+
SHELL [ "bash", "-clo", "errexit" ]
48
ARG name
59
ARG version
6-
COPY docker-compose-cli-plugin ${prefix}${target}/libexec/docker/cli-plugins/docker-compose
710
RUN <<EOF
811
check-github-release-asset "docker/compose" "${version}" "docker-compose-Linux-${arch}"
9-
curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose" \
12+
curl --silent --location --fail --output "${prefix}/bin/docker-compose" \
1013
"https://github.com/docker/compose/releases/download/${version}/docker-compose-Linux-${arch}"
11-
chmod +x "${prefix}${target}/bin/docker-compose"
14+
chmod +x "${prefix}/bin/docker-compose"
1215
EOF

‎tools/docker-compose-v1/docker-compose-cli-plugin

-25
This file was deleted.

‎tools/docker-compose/Dockerfile.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG name
99
ARG version
1010
RUN <<EOF
1111
check-github-release-asset "docker/compose" "v${version}" "docker-compose-linux-${arch}"
12-
curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-compose" \
12+
curl --silent --location --fail --output "${prefix}/libexec/docker/cli-plugins/docker-compose" \
1313
"https://github.com/docker/compose/releases/download/v${version}/docker-compose-linux-${arch}"
14-
chmod +x "${prefix}${target}/libexec/docker/cli-plugins/docker-compose"
14+
chmod +x "${prefix}/libexec/docker/cli-plugins/docker-compose"
1515
EOF

‎tools/docker-credential-acr-env/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ ARG version
1010
RUN <<EOF
1111
check-github-release-asset "chrismellard/docker-credential-acr-env" "${version}" "docker-credential-acr-env_${version}_linux_${alt_arch}.tar.gz"
1212
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" \
13-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
13+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1414
docker-credential-acr-env
1515
EOF

‎tools/docker-credential-ecr-login/Dockerfile.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG name
1010
ARG version
1111

1212
RUN <<EOF
13-
curl --silent --location --fail --output "${prefix}${target}/bin/docker-credential-ecr-login" \
13+
curl --silent --location --fail --output "${prefix}/bin/docker-credential-ecr-login" \
1414
"https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${version}/linux-${alt_arch}/docker-credential-ecr-login"
15-
chmod +x "${prefix}${target}/bin/docker-credential-ecr-login"
15+
chmod +x "${prefix}/bin/docker-credential-ecr-login"
1616
EOF

‎tools/docker-credential-gcr/Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ ARG version
1111

1212
RUN <<EOF
1313
curl --silent --location --fail "https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v${version}/docker-credential-gcr_linux_${alt_arch}-${version}.tar.gz" \
14-
| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
14+
| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
1515
docker-credential-gcr
1616
EOF

0 commit comments

Comments
 (0)