Fix builds #2213

uniget-org · Jan 1, 2024 · 3c90d9e · 3c90d9e
1 parent 11905d3
commit 3c90d9e
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/tools/k2d/Dockerfile.template b/tools/k2d/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/portainer/k2d
 ARG name
 ARG version

diff --git a/tools/keybase/Dockerfile.template b/tools/keybase/Dockerfile.template
@@ -12,7 +12,7 @@ apt-get update
 apt-get -y install --no-install-recommends \
     build-essential
 EOF
-COPY --link --from=go / /
+COPY --link --from=go / /usr/local/
 WORKDIR /go/src/github.com/keybase/client
 ARG name
 ARG version

diff --git a/tools/keyoxide/Dockerfile.template b/tools/keyoxide/Dockerfile.template
@@ -8,9 +8,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/keyoxide
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/keyoxide
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kube-apiserver/Dockerfile.template b/tools/kube-apiserver/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kube-controller-manager/Dockerfile.template b/tools/kube-controller-manager/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kube-proxy/Dockerfile.template b/tools/kube-proxy/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kube-scheduler/Dockerfile.template b/tools/kube-scheduler/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kubeadm/Dockerfile.template b/tools/kubeadm/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 COPY kubelet.service ${prefix}/etc/systemd/system/

diff --git a/tools/kubebox/Dockerfile.template b/tools/kubebox/Dockerfile.template
@@ -8,9 +8,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/kubebox
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/kubebox
 ARG name
 ARG version
 RUN <<EOF

diff --git a/tools/kubectl-plugins/Dockerfile.template b/tools/kubectl-plugins/Dockerfile.template
@@ -14,7 +14,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=krew / /
+COPY --from=krew / /usr/local/
 ARG name
 ARG version
 COPY --chmod=755 <<EOF ${prefix}/bin/krew-uniget

diff --git a/tools/kubectl/Dockerfile.template b/tools/kubectl/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 COPY kubectl.sh ${prefix}/etc/profile.d/
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}/bin/kubectl" \

diff --git a/tools/kubelet/Dockerfile.template b/tools/kubelet/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=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 COPY kubelet.service ${prefix}/etc/systemd/system/