Skip to content

Commit

Permalink
Removed target var #2213
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasdille committed Jan 2, 2024
1 parent 3f6bdfe commit 293c8e6
Show file tree
Hide file tree
Showing 46 changed files with 120 additions and 120 deletions.
4 changes: 2 additions & 2 deletions tools/salami/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ esac
echo " Using ${arch_suffix}"

check-github-release-asset "petrgazarov/salami" "${version}" "salami-${version}-linux-${arch_suffix}"
curl --silent --location --fail --output "${prefix}${target}/bin/salami" \
curl --silent --location --fail --output "${prefix}/bin/salami" \
"https://github.com/petrgazarov/salami/releases/download/${version}/salami-${version}-linux-${arch_suffix}"
chmod +x "${prefix}${target}/bin/salami"
chmod +x "${prefix}/bin/salami"
EOF
2 changes: 1 addition & 1 deletion tools/sbom-operator/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ COSIGN_EXPERIMENTAL=1 cosign verify-blob "sbom-operator_${version}_linux_${alt_a
--certificate-github-workflow-ref refs/heads/main \
--certificate-github-workflow-trigger workflow_dispatch

tar --extract --gzip --file "sbom-operator_${version}_linux_${alt_arch}.tar.gz" --directory="${prefix}${target}/bin/" --no-same-owner \
tar --extract --gzip --file "sbom-operator_${version}_linux_${alt_arch}.tar.gz" --directory="${prefix}/bin/" --no-same-owner \
sbom-operator
EOF
4 changes: 2 additions & 2 deletions tools/sbom-tool/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "microsoft/sbom-tool" "v${version}" "sbom-tool-linux-x64"
curl --silent --location --fail --output "${prefix}${target}/bin/sbom-tool" \
curl --silent --location --fail --output "${prefix}/bin/sbom-tool" \
"https://github.com/microsoft/sbom-tool/releases/download/v${version}/sbom-tool-linux-x64"
chmod +x "${prefix}${target}/bin/sbom-tool"
chmod +x "${prefix}/bin/sbom-tool"
EOF
8 changes: 4 additions & 4 deletions tools/sbom-utility/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ ARG version
RUN <<EOF
check-github-release-asset "CycloneDX/sbom-utility" "v${version}" "sbom-utility-v${version}-linux-${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/CycloneDX/sbom-utility/releases/download/v${version}/sbom-utility-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 \
sbom-utility \
config.json \
custom.json \
license.json

"${prefix}${target}/bin/sbom-utility" completion bash >"${prefix}${target}/share/bash-completion/completions/sbom-utility"
"${prefix}${target}/bin/sbom-utility" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/sbom-utility.fish"
"${prefix}${target}/bin/sbom-utility" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_sbom-utility"
"${prefix}/bin/sbom-utility" completion bash >"${prefix}/share/bash-completion/completions/sbom-utility"
"${prefix}/bin/sbom-utility" completion fish >"${prefix}/share/fish/vendor_completions.d/sbom-utility.fish"
"${prefix}/bin/sbom-utility" completion zsh >"${prefix}/share/zsh/vendor-completions/_sbom-utility"
EOF
2 changes: 1 addition & 1 deletion tools/sbom2dot/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ apt-get -y install --no-install-recommends \
python-is-python3
EOF
RUN <<EOF
shiv --output-file "${prefix}${target}/bin/sbom2dot" --console-script sbom2dot "sbom2dot==${version}"
shiv --output-file "${prefix}/bin/sbom2dot" --console-script sbom2dot "sbom2dot==${version}"
EOF
2 changes: 1 addition & 1 deletion tools/sbomdiff/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ EOF
ARG name
ARG version
RUN <<EOF
shiv --output-file "${prefix}${target}/bin/sbomdiff" --console-script sbomdiff "sbomdiff==${version}"
shiv --output-file "${prefix}/bin/sbomdiff" --console-script sbomdiff "sbomdiff==${version}"
EOF
2 changes: 1 addition & 1 deletion tools/sbomtools/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ ARG name
ARG version
RUN <<EOF
for BINARY in sbomgrep sbomls sbomrm sbomupdate; do
shiv --output-file "${prefix}${target}/bin/${BINARY}" --console-script "${BINARY}" "sbomtools==${version}"
shiv --output-file "${prefix}/bin/${BINARY}" --console-script "${BINARY}" "sbomtools==${version}"
done
EOF
6 changes: 3 additions & 3 deletions tools/sbt/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "sbt/sbt" "v${version}" "sbt-${version}.tgz"
mkdir -p "${prefix}${target}/opt/sbt"
mkdir -p "${prefix}/opt/sbt"
curl --silent --location --fail "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" \
| tar --extract --gzip --directory="${prefix}${target}/opt/sbt" --strip-components=1 --no-same-owner \
| tar --extract --gzip --directory="${prefix}/opt/sbt" --strip-components=1 --no-same-owner \
sbt/bin/sbt \
sbt/bin/sbt-launch.jar \
sbt/bin/sbtn-x86_64-pc-linux
ln --symbolic --relative --force "${prefix}${target}/opt/sbt/bin/sbt" "${prefix}${target}/bin/sbt"
ln --symbolic --relative --force "${prefix}/opt/sbt/bin/sbt" "${prefix}/bin/sbt"
EOF
6 changes: 3 additions & 3 deletions tools/scala/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
RUN <<EOF
mkdir -p "${prefix}${target}/opt/scala"
mkdir -p "${prefix}/opt/scala"
curl --silent --location --fail "https://downloads.lightbend.com/scala/${version}/scala-${version}.tgz" \
| tar --extract --gzip --directory="${prefix}${target}/opt/scala" --strip-components=1 --no-same-owner
ln --symbolic --relative --force "${prefix}${target}/opt/scala/bin/scala" "${prefix}${target}/bin/scala"
| tar --extract --gzip --directory="${prefix}/opt/scala" --strip-components=1 --no-same-owner
ln --symbolic --relative --force "${prefix}/opt/scala/bin/scala" "${prefix}/bin/scala"
EOF
2 changes: 1 addition & 1 deletion tools/scc/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ check-github-release-asset "boyter/scc" "v${version}" "scc_Linux_${arch_suffix}.

echo "### Downloading scc ${version}"
curl --silent --location --fail "https://github.com/boyter/scc/releases/download/v${version}/scc_Linux_${arch_suffix}.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
scc
EOF
10 changes: 5 additions & 5 deletions tools/scorecard/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ARG version
RUN <<EOF
check-github-release-asset "ossf/scorecard" "v${version}" "scorecard_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/ossf/scorecard/releases/download/v${version}/scorecard_${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 \
scorecard-linux-${alt_arch}
mv "${prefix}${target}/bin/scorecard-linux-${alt_arch}" "${prefix}${target}/bin/scorecard"
"${prefix}${target}/bin/scorecard" completion bash | sed 's|./scorecard|scorecard|g' >"${prefix}${target}/share/bash-completion/completions/scorecard"
"${prefix}${target}/bin/scorecard" completion fish | sed 's|./scorecard|scorecard|g' >"${prefix}${target}/share/fish/vendor_completions.d/scorecard.fish"
"${prefix}${target}/bin/scorecard" completion zsh | sed 's|./scorecard|scorecard|g' >"${prefix}${target}/share/zsh/vendor-completions/_scorecard"
mv "${prefix}/bin/scorecard-linux-${alt_arch}" "${prefix}/bin/scorecard"
"${prefix}/bin/scorecard" completion bash | sed 's|./scorecard|scorecard|g' >"${prefix}/share/bash-completion/completions/scorecard"
"${prefix}/bin/scorecard" completion fish | sed 's|./scorecard|scorecard|g' >"${prefix}/share/fish/vendor_completions.d/scorecard.fish"
"${prefix}/bin/scorecard" completion zsh | sed 's|./scorecard|scorecard|g' >"${prefix}/share/zsh/vendor-completions/_scorecard"
EOF
6 changes: 3 additions & 3 deletions tools/sealer/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ARG version
RUN <<EOF
check-github-release-asset "sealerio/sealer" "v${version}" "sealer-v${version}-linux-${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/sealerio/sealer/releases/download/v${version}/sealer-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

check-github-release-asset "sealerio/sealer" "v${version}" "seautil-v${version}-linux-${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/sealerio/sealer/releases/download/v${version}/seautil-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

"${prefix}${target}/bin/sealer" completion bash >"${prefix}${target}/share/bash-completion/completions/sealer"
"${prefix}/bin/sealer" completion bash >"${prefix}/share/bash-completion/completions/sealer"
EOF
8 changes: 4 additions & 4 deletions tools/secretize/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ ARG version
RUN <<EOF
check-github-release-asset "bbl/secretize" "${version}" "secretize-${version}-linux-amd64.tar.gz"
curl --silent --location --fail "https://github.com/bbl/secretize/releases/download/${version}/secretize-${version}-linux-amd64.tar.gz" \
| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
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
12 changes: 6 additions & 6 deletions tools/semgrep/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ apt-get -y install --no-install-recommends \
python3-venv \
python-is-python3
EOF
WORKDIR ${prefix}${target}/libexec/semgrep
WORKDIR ${prefix}/libexec/semgrep
RUN <<EOF
#shiv --output-file "${prefix}${target}/bin/semgrep" --console-script semgrep "semgrep==${version}"
python -m venv "${prefix}${target}/libexec/semgrep"
source "${prefix}${target}/libexec/semgrep/bin/activate"
#shiv --output-file "${prefix}/bin/semgrep" --console-script semgrep "semgrep==${version}"
python -m venv "${prefix}/libexec/semgrep"
source "${prefix}/libexec/semgrep/bin/activate"
pip install "semgrep==${version}"
deactivate
ln --symbolic --relative --force "${prefix}${target}/libexec/semgrep/bin/semgrep" "${prefix}${target}/bin/"
ln --symbolic --relative --force "${prefix}${target}/libexec/semgrep/bin/pysemgrep" "${prefix}${target}/bin/"
ln --symbolic --relative --force "${prefix}/libexec/semgrep/bin/semgrep" "${prefix}/bin/"
ln --symbolic --relative --force "${prefix}/libexec/semgrep/bin/pysemgrep" "${prefix}/bin/"
EOF
4 changes: 2 additions & 2 deletions tools/semver/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
RUN <<EOF
curl --silent --location --fail --output "${prefix}${target}/bin/semver" \
curl --silent --location --fail --output "${prefix}/bin/semver" \
"https://github.com/fsaintjacques/semver-tool/raw/${version}/src/semver"
chmod +x "${prefix}${target}/bin/semver"
chmod +x "${prefix}/bin/semver"
EOF
4 changes: 2 additions & 2 deletions tools/serverless/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ ARG name
ARG version
COPY --link --from=nodejs / /
COPY --link --from=npm / /
WORKDIR ${prefix}${target}/libexec/serverless
WORKDIR ${prefix}/libexec/serverless
ARG name
ARG version
RUN <<EOF
npm install \
--omit=dev \
"serverless@${version}"
ln --symbolic --relative --force "${prefix}${target}/libexec/serverless/node_modules/.bin/serverless" "${prefix}${target}/bin/"
ln --symbolic --relative --force "${prefix}/libexec/serverless/node_modules/.bin/serverless" "${prefix}/bin/"
EOF
4 changes: 2 additions & 2 deletions tools/shdotenv/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "ko1nksm/shdotenv" "v${version}" "shdotenv"
curl --silent --location --fail --output "${prefix}${target}/bin/shdotenv" \
curl --silent --location --fail --output "${prefix}/bin/shdotenv" \
"https://github.com/ko1nksm/shdotenv/releases/download/v${version}/shdotenv"
chmod +x "${prefix}${target}/bin/shdotenv"
chmod +x "${prefix}/bin/shdotenv"
EOF
2 changes: 1 addition & 1 deletion tools/shell-gpt/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ ARG version
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
RUN <<EOF
shiv --output-file "${prefix}${target}/bin/sgpt" --console-script sgpt "shell-gpt==${version}"
shiv --output-file "${prefix}/bin/sgpt" --console-script sgpt "shell-gpt==${version}"
EOF
10 changes: 5 additions & 5 deletions tools/shellcheck/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ ARG version
RUN <<EOF
check-github-release-asset "koalaman/shellcheck" "v${version}" "shellcheck-v${version}.linux.${arch}.tar.xz"
curl --silent --location --fail "https://github.com/koalaman/shellcheck/releases/download/v${version}/shellcheck-v${version}.linux.${arch}.tar.xz" \
| tar --extract --xz --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
| tar --extract --xz --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
shellcheck-v${version}/shellcheck
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/shellcheck.1.md" \
curl --silent --location --fail --output "${prefix}/share/man/man1/shellcheck.1.md" \
"https://github.com/koalaman/shellcheck/raw/v${version}/shellcheck.1.md"
go-md2man \
-in "${prefix}${target}/share/man/man1/shellcheck.1.md" \
-out "${prefix}${target}/share/man/man1/shellcheck.1"
rm "${prefix}${target}/share/man/man1/shellcheck.1.md"
-in "${prefix}/share/man/man1/shellcheck.1.md" \
-out "${prefix}/share/man/man1/shellcheck.1"
rm "${prefix}/share/man/man1/shellcheck.1.md"
EOF
4 changes: 2 additions & 2 deletions tools/shiv/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "linkedin/shiv" "${version}" "shiv"
curl --silent --location --fail --output "${prefix}${target}/bin/shiv" \
curl --silent --location --fail --output "${prefix}/bin/shiv" \
"https://github.com/linkedin/shiv/releases/download/${version}/shiv"
chmod +x "${prefix}${target}/bin/shiv"
chmod +x "${prefix}/bin/shiv"
EOF
2 changes: 1 addition & 1 deletion tools/sish/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ ARG version
RUN <<EOF
check-github-release-asset "antoniomika/sish" "v${version}" "sish-${version}.linux-amd64.tar.gz"
curl --silent --location --fail "https://github.com/antoniomika/sish/releases/download/v${version}/sish-${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 \
sish-${version}.linux-${alt_arch}/sish
EOF
6 changes: 3 additions & 3 deletions tools/skopeo/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ WORKDIR $GOPATH/src/github.com/containers/skopeo
RUN git clone --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containers/skopeo.git .
ENV CGO_ENABLED=0
RUN <<EOF
mkdir -p "${prefix}${target}/share/man/man1"
mkdir -p "${prefix}/share/man/man1"
make bin/skopeo EXTRA_LDFLAGS="-s -w -extldflags '-static'" BUILDTAGS=containers_image_openpgp GO_DYN_FLAGS=
make docs GOMD2MAN=go-md2man
mv bin/skopeo "${prefix}${target}/bin/"
mv docs/*.1 "${prefix}${target}/share/man/man1/"
mv bin/skopeo "${prefix}/bin/"
mv docs/*.1 "${prefix}/share/man/man1/"
EOF
2 changes: 1 addition & 1 deletion tools/slides/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ ARG version
RUN <<EOF
check-github-release-asset "maaslalani/slides" "v${version}" "slides_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/maaslalani/slides/releases/download/v${version}/slides_${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 \
slides
EOF
6 changes: 3 additions & 3 deletions tools/slirp4netns/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "rootless-containers/slirp4netns" "v${version}" "slirp4netns-${arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/slirp4netns" \
curl --silent --location --fail --output "${prefix}/bin/slirp4netns" \
"https://github.com/rootless-containers/slirp4netns/releases/download/v${version}/slirp4netns-${arch}"
chmod +x "${prefix}${target}/bin/slirp4netns"
curl --silent --location --fail --output "${prefix}${target}/share/man/man1/slirp4netns.1" \
chmod +x "${prefix}/bin/slirp4netns"
curl --silent --location --fail --output "${prefix}/share/man/man1/slirp4netns.1" \
"https://github.com/rootless-containers/slirp4netns/raw/v${version}/slirp4netns.1"
EOF
2 changes: 1 addition & 1 deletion tools/sloop/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARG name
ARG version
ENV CGO_ENABLED=0 \
GO111MODULE=auto \
GOBIN=${prefix}${target}/bin
GOBIN=${prefix}/bin
RUN <<EOF
git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/salesforce/sloop .
make
Expand Down
4 changes: 2 additions & 2 deletions tools/slsa-verifier/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "slsa-framework/slsa-verifier" "v${version}" "slsa-verifier-linux-${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/slsa-verifier" \
curl --silent --location --fail --output "${prefix}/bin/slsa-verifier" \
"https://github.com/slsa-framework/slsa-verifier/releases/download/v${version}/slsa-verifier-linux-${alt_arch}"
chmod +x "${prefix}${target}/bin/slsa-verifier"
chmod +x "${prefix}/bin/slsa-verifier"
EOF
2 changes: 1 addition & 1 deletion tools/socat/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
COPY --from=build /usr/local ${prefix}${target}/
COPY --from=build /usr/local ${prefix}/
10 changes: 5 additions & 5 deletions tools/sonar-scanner/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ RUN <<EOF
url="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-linux.zip"
filename="$(basename "${url}")"
curl --silent --location --fail --remote-name "${url}"
unzip -q -o -d "${prefix}${target}/opt" "${filename}"
mv "${prefix}${target}/opt/sonar-scanner-${version}-linux" "${prefix}${target}/opt/sonar-scanner"
sed -i 's/use_embedded_jre=true/use_embedded_jre=false/' "${prefix}${target}/opt/sonar-scanner/bin/sonar-scanner"
rm -rf "${prefix}${target}/opt/sonar-scanner/jre"
ln --symbolic --relative --force "${prefix}${target}/opt/sonar-scanner/bin/sonar-scanner" "${prefix}${target}/bin/sonar-scanner"
unzip -q -o -d "${prefix}/opt" "${filename}"
mv "${prefix}/opt/sonar-scanner-${version}-linux" "${prefix}/opt/sonar-scanner"
sed -i 's/use_embedded_jre=true/use_embedded_jre=false/' "${prefix}/opt/sonar-scanner/bin/sonar-scanner"
rm -rf "${prefix}/opt/sonar-scanner/jre"
ln --symbolic --relative --force "${prefix}/opt/sonar-scanner/bin/sonar-scanner" "${prefix}/bin/sonar-scanner"
EOF
8 changes: 4 additions & 4 deletions tools/sonobuoy/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ARG version
RUN <<EOF
check-github-release-asset "vmware-tanzu/sonobuoy" "v${version}" "sonobuoy_${version}_linux_${alt_arch}.tar.gz"
curl --silent --location --fail "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${version}/sonobuoy_${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 \
sonobuoy

"${prefix}${target}/bin/sonobuoy" completion bash >"${prefix}${target}/share/bash-completion/completions/sonobuoy"
"${prefix}${target}/bin/sonobuoy" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/sonobuoy.fish"
"${prefix}${target}/bin/sonobuoy" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_sonobuoy"
"${prefix}/bin/sonobuoy" completion bash >"${prefix}/share/bash-completion/completions/sonobuoy"
"${prefix}/bin/sonobuoy" completion fish >"${prefix}/share/fish/vendor_completions.d/sonobuoy.fish"
"${prefix}/bin/sonobuoy" completion zsh >"${prefix}/share/zsh/vendor-completions/_sonobuoy"
EOF
4 changes: 2 additions & 2 deletions tools/sops/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG name
ARG version
RUN <<EOF
check-github-release-asset "mozilla/sops" "v${version}" "sops-v${version}.linux.${alt_arch}"
curl --silent --location --fail --output "${prefix}${target}/bin/sops" \
curl --silent --location --fail --output "${prefix}/bin/sops" \
"https://github.com/mozilla/sops/releases/download/v${version}/sops-v${version}.linux.${alt_arch}"
chmod +x "${prefix}${target}/bin/sops"
chmod +x "${prefix}/bin/sops"
EOF
Loading

0 comments on commit 293c8e6

Please sign in to comment.