Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 649ae62

Browse files
nicholasdillenicholasdille
committed
Moved tool for #6270 
1 parent 30a74f3 commit 649ae62

File tree

20 files changed

+64
-65
lines changed

20 files changed

+64
-65
lines changed

‎tools/actions-runner/Dockerfile.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG ref=main
44

55
FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
6-
WORKDIR ${prefix}/opt/actions-runner
6+
WORKDIR ${prefix}${target}/opt/actions-runner
77
ARG name
88
ARG version
99
RUN <<EOF

‎tools/cypher-shell/Dockerfile.template

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#syntax=docker/dockerfile:1.5.2
22

33
ARG ref=main
4-
FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
54

5+
FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
66
ARG name
77
ARG version
8-
98
RUN <<EOF
10-
mkdir -p "${prefix}/opt"
9+
mkdir -p "${prefix}${target}/opt"
1110
url="https://dist.neo4j.org/cypher-shell/cypher-shell-${version}.zip"
1211
filename="$(basename "${url}")"
1312
curl --silent --location --fail --remote-name "${url}"
14-
unzip -q -o -d "${prefix}/opt/" "${filename}"
15-
mv "${prefix}/opt/cypher-shell-${version}" "${prefix}/opt/cypher-shell"
16-
ln --symbolic --relative --force "/opt/cypher-shell/bin/cypher-shell" "${prefix}${target}/bin/"
13+
unzip -q -o -d "${prefix}${target}/opt/" "${filename}"
14+
mv "${prefix}${target}/opt/cypher-shell-${version}" "${prefix}${target}/opt/cypher-shell"
15+
ln --symbolic --relative --force "${target}/opt/cypher-shell/bin/cypher-shell" "${prefix}${target}/bin/"
1716
EOF

‎tools/dependency-check/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN <<EOF
99
url="https://github.com/jeremylong/DependencyCheck/releases/download/v${version}/dependency-check-${version}-release.zip"
1010
filename="$(basename "${url}")"
1111
curl --silent --location --fail --remote-name "${url}"
12-
unzip -q -o -d "${prefix}/opt" "${filename}"
13-
ln --symbolic --relative --force /opt/dependency-check/bin/dependency-check.sh "${prefix}${target}/bin/dependency-check.sh"
14-
mv "${prefix}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
12+
unzip -q -o -d "${prefix}${target}/opt" "${filename}"
13+
ln --symbolic --relative --force "${target}/opt/dependency-check/bin/dependency-check.sh" "${prefix}${target}/bin/dependency-check.sh"
14+
mv "${prefix}${target}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
1515
EOF

‎tools/dotnet/Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ ARG name
77
ARG version
88
RUN <<EOF
99
curl --silent --location --fail --remote-name https://dot.net/v1/dotnet-install.sh
10-
bash dotnet-install.sh --channel STS --version ${version} --install-dir "${prefix}/opt/dotnet"
11-
ln --symbolic --relative --force "${prefix}/opt/dotnet/dotnet" "${prefix}${target}/bin/dotnet"
10+
bash dotnet-install.sh --channel STS --version ${version} --install-dir "${prefix}${target}/opt/dotnet"
11+
ln --symbolic --relative --force "${prefix}${target}/opt/dotnet/dotnet" "${prefix}${target}/bin/dotnet"
1212
EOF

‎tools/gcloud/Dockerfile.template

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ FROM ghcr.io/nicholasdille/docker-setup/shiv:${ref} AS shiv
88
FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
99
ARG name
1010
ARG version
11-
WORKDIR ${prefix}/opt/gcloud
11+
WORKDIR ${prefix}${target}/opt/gcloud
1212
RUN <<EOF
1313
curl --silent --location --fail "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${version}-linux-${arch}.tar.gz" \
1414
| tar --extract --gzip --strip-components=1 --no-same-owner
15-
ln --symbolic --relative --force "${prefix}/opt/gcloud/bin/gcloud" "${prefix}${target}/bin/gcloud"
16-
ln --symbolic --relative --force "${prefix}/opt/gcloud/bin/bq" "${prefix}${target}/bin/bq"
15+
ln --symbolic --relative --force "${prefix}${target}/opt/gcloud/bin/gcloud" "${prefix}${target}/bin/gcloud"
16+
ln --symbolic --relative --force "${prefix}${target}/opt/gcloud/bin/bq" "${prefix}${target}/bin/bq"
1717

18-
cp "${prefix}/opt/gcloud/path.bash.inc" "${prefix}${target}/share/bash-completion/completions/foo"
19-
cp "${prefix}/opt/gcloud/path.fish.inc" "${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
20-
cp "${prefix}/opt/gcloud/path.zsh.inc" "${prefix}${target}/share/zsh/vendor-completions/_foo"
18+
cp "${prefix}${target}/opt/gcloud/path.bash.inc" "${prefix}${target}/share/bash-completion/completions/foo"
19+
cp "${prefix}${target}/opt/gcloud/path.fish.inc" "${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
20+
cp "${prefix}${target}/opt/gcloud/path.zsh.inc" "${prefix}${target}/share/zsh/vendor-completions/_foo"
2121
EOF

‎tools/go/Dockerfile.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
66
ARG name
77
ARG version
88
RUN <<EOF
9-
mkdir -p "${prefix}/opt/go"
9+
mkdir -p "${prefix}${target}/opt/go"
1010
curl --silent --location --fail "https://go.dev/dl/go${version}.linux-${alt_arch}.tar.gz" \
11-
| tar --extract --gzip --directory="${prefix}/opt/go" --strip-components=1 --no-same-owner
12-
ln --symbolic --relative --force "${prefix}/opt/go/bin/go" "${prefix}${target}/bin/go"
13-
ln --symbolic --relative --force "${prefix}/opt/go/bin/gofmt" "${prefix}${target}/bin/gofmt"
11+
| tar --extract --gzip --directory="${prefix}${target}/opt/go" --strip-components=1 --no-same-owner
12+
ln --symbolic --relative --force "${prefix}${target}/opt/go/bin/go" "${prefix}${target}/bin/go"
13+
ln --symbolic --relative --force "${prefix}${target}/opt/go/bin/gofmt" "${prefix}${target}/bin/gofmt"
1414
EOF

‎tools/gradle/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test "${version:0-2}" == ".0" && fixed_version="${version:0:-2}"
1111
url="https://services.gradle.org/distributions/gradle-${fixed_version}-bin.zip"
1212
filename="$(basename "${url}")"
1313
curl --silent --location --fail --remote-name "${url}"
14-
unzip -q -o -d "${prefix}/opt" "${filename}"
15-
mv "${prefix}/opt/gradle-${fixed_version}" "${prefix}/opt/gradle"
16-
ln --symbolic --relative --force "${prefix}/opt/gradle/bin/gradle" "${prefix}${target}/bin/gradle"
14+
unzip -q -o -d "${prefix}${target}/opt" "${filename}"
15+
mv "${prefix}${target}/opt/gradle-${fixed_version}" "${prefix}${target}/opt/gradle"
16+
ln --symbolic --relative --force "${prefix}${target}/opt/gradle/bin/gradle" "${prefix}${target}/bin/gradle"
1717
EOF

‎tools/jaxb/Dockerfile.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ RUN <<EOF
99
url="https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-ri/${version}/jaxb-ri-${version}.zip"
1010
filename="$(basename "${url}")"
1111
curl --silent --location --fail --remote-name "${url}"
12-
unzip -q -o -d "${prefix}/opt/" "${filename}"
12+
unzip -q -o -d "${prefix}${target}/opt/" "${filename}"
1313
rm -rf \
14-
"${prefix}/opt/jaxb-ri/docs" \
15-
"${prefix}/opt/jaxb-ri/samples"
16-
ln --symbolic --relative --force "${prefix}/opt/jaxb-ri/bin/xjc.sh" "${prefix}${target}/bin/xjc"
14+
"${prefix}${target}/opt/jaxb-ri/docs" \
15+
"${prefix}${target}/opt/jaxb-ri/samples"
16+
ln --symbolic --relative --force "${prefix}${target}/opt/jaxb-ri/bin/xjc.sh" "${prefix}${target}/bin/xjc"
1717
EOF

‎tools/jenkins-remoting/Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
66
ARG name
77
ARG version
88
RUN <<EOF
9-
mkdir -p "${prefix}/opt/jenkins"
10-
curl --silent --location --fail --output "${prefix}/opt/jenkins/remoting.jar" \
9+
mkdir -p "${prefix}${target}/opt/jenkins"
10+
curl --silent --location --fail --output "${prefix}${target}/opt/jenkins/remoting.jar" \
1111
"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${version}/remoting-${version}.jar"
1212
EOF

‎tools/maven/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
66
ARG name
77
ARG version
88
RUN <<EOF
9-
mkdir -p "${prefix}/opt/maven"
9+
mkdir -p "${prefix}${target}/opt/maven"
1010
curl --silent --location --fail "https://archive.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz" \
11-
| tar --extract --gzip --directory="${prefix}/opt/maven" --strip-components=1 --no-same-owner
12-
ln --symbolic --relative --force "${prefix}/opt/maven/bin/mvn" "${prefix}${target}/bin/mvn"
11+
| tar --extract --gzip --directory="${prefix}${target}/opt/maven" --strip-components=1 --no-same-owner
12+
ln --symbolic --relative --force "${prefix}${target}/opt/maven/bin/mvn" "${prefix}${target}/bin/mvn"
1313
EOF

0 commit comments

Comments
 (0)