From 2d989d9277140884b04cdafd06c9bc56e2e5447d Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Tue, 2 Jan 2024 14:05:22 +0100
Subject: [PATCH] Fixed builds #2213

---
 tools/sbom-operator/Dockerfile.template | 2 +-
 tools/sbom2dot/Dockerfile.template      | 2 +-
 tools/sbomdiff/Dockerfile.template      | 2 +-
 tools/sbomtools/Dockerfile.template     | 2 +-
 tools/semgrep/Dockerfile.template       | 2 +-
 tools/serverless/Dockerfile.template    | 6 +++---
 tools/shell-gpt/Dockerfile.template     | 2 +-
 tools/shellcheck/Dockerfile.template    | 2 +-
 tools/skopeo/Dockerfile.template        | 4 ++--
 tools/sloop/Dockerfile.template         | 4 ++--
 tools/stdin-spinner/Dockerfile.template | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/sbom-operator/Dockerfile.template b/tools/sbom-operator/Dockerfile.template
index 4a5a3a9216..8f7ed173da 100644
--- a/tools/sbom-operator/Dockerfile.template
+++ b/tools/sbom-operator/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 --link --from=cosign / /
+COPY --link --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/sbom2dot/Dockerfile.template b/tools/sbom2dot/Dockerfile.template
index 5bd8785ef9..92caa1fa30 100644
--- a/tools/sbom2dot/Dockerfile.template
+++ b/tools/sbom2dot/Dockerfile.template
@@ -11,7 +11,7 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 #COPY --link --from=python / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/sbomdiff/Dockerfile.template b/tools/sbomdiff/Dockerfile.template
index d7635978f0..54eec91190 100644
--- a/tools/sbomdiff/Dockerfile.template
+++ b/tools/sbomdiff/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/sbomtools/Dockerfile.template b/tools/sbomtools/Dockerfile.template
index 4a2c570261..8dffced19f 100644
--- a/tools/sbomtools/Dockerfile.template
+++ b/tools/sbomtools/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/semgrep/Dockerfile.template b/tools/semgrep/Dockerfile.template
index ad4cffb73f..7af72f2cb7 100644
--- a/tools/semgrep/Dockerfile.template
+++ b/tools/semgrep/Dockerfile.template
@@ -19,7 +19,7 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-WORKDIR ${prefix}/libexec/semgrep
+WORKDIR /uniget_bootstrap/libexec/semgrep
 RUN <<EOF
 #shiv --output-file "${prefix}/bin/semgrep" --console-script semgrep "semgrep==${version}"
 python -m venv "${prefix}/libexec/semgrep"
diff --git a/tools/serverless/Dockerfile.template b/tools/serverless/Dockerfile.template
index ad26ceb177..13a0ed649d 100644
--- a/tools/serverless/Dockerfile.template
+++ b/tools/serverless/Dockerfile.template
@@ -10,9 +10,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/serverless
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/serverless
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/shell-gpt/Dockerfile.template b/tools/shell-gpt/Dockerfile.template
index f7c4a4ec41..c4ff550f7b 100644
--- a/tools/shell-gpt/Dockerfile.template
+++ b/tools/shell-gpt/Dockerfile.template
@@ -17,7 +17,7 @@ EOF
 ARG name
 ARG version
 #COPY --link --from=python / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 shiv --output-file "${prefix}/bin/sgpt" --console-script sgpt "shell-gpt==${version}"
 EOF
\ No newline at end of file
diff --git a/tools/shellcheck/Dockerfile.template b/tools/shellcheck/Dockerfile.template
index 0172828ab8..d18c520294 100644
--- a/tools/shellcheck/Dockerfile.template
+++ b/tools/shellcheck/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=go-md2man / /
+COPY --from=go-md2man / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/skopeo/Dockerfile.template b/tools/skopeo/Dockerfile.template
index f15e5fd061..1272a38d3b 100644
--- a/tools/skopeo/Dockerfile.template
+++ b/tools/skopeo/Dockerfile.template
@@ -8,8 +8,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=go / /
-COPY --link --from=go-md2man / /
+COPY --link --from=go / /usr/local/
+COPY --link --from=go-md2man / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/sloop/Dockerfile.template b/tools/sloop/Dockerfile.template
index 16701a76bf..b7e1456b87 100644
--- a/tools/sloop/Dockerfile.template
+++ b/tools/sloop/Dockerfile.template
@@ -8,8 +8,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=go / /
-COPY --link --from=make / /
+COPY --link --from=go / /usr/local/
+COPY --link --from=make / /usr/local/
 WORKDIR /go/src/github.com/salesforce/sloop
 ARG name
 ARG version
diff --git a/tools/stdin-spinner/Dockerfile.template b/tools/stdin-spinner/Dockerfile.template
index 4a88cd10c3..57d51ae02b 100644
--- a/tools/stdin-spinner/Dockerfile.template
+++ b/tools/stdin-spinner/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 --link --from=go / /
+COPY --link --from=go / /usr/local/
 WORKDIR /go/src/github.com/sgreben/stdin-spinner
 ARG name
 ARG version