Fixed builds #2213

uniget-org · Jan 2, 2024 · 4dc387b · 4dc387b
1 parent 2b65e4b
commit 4dc387b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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