Skip to content

Commit

Permalink
Fixed build #2213
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicholasdille
nicholasdille committed Jan 8, 2024
1 parent 1a4e173 commit c004e6f
Show file tree
Hide file tree
Showing 58 changed files with 91 additions and 91 deletions.
4 changes: 2 additions & 2 deletions tools/acr/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
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/Azure/acr-cli
RUN <<EOF
git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/Azure/acr-cli .
Expand Down
4 changes: 2 additions & 2 deletions tools/apko/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/chainguard-dev/apko
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/autocert/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/aws/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apt-get -y install --no-install-recommends \
python-is-python3
EOF
#COPY --link --from=python / /usr/local/
COPY --link --from=shiv / /
COPY --link --from=shiv / /usr/local/
ARG name
ARG version
COPY <<EOF ${prefix}/etc/profile.d/aws
Expand Down
2 changes: 1 addition & 1 deletion tools/az/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tools/bogrod/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions tools/buildah/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
/etc/profile.d/ \
/etc/profile.d/
SHELL [ "bash", "-clo", "errexit" ]
COPY --from=go / /
COPY --from=make / /
COPY --from=go-md2man / /
COPY --from=go / /usr/local/
COPY --from=make / /usr/local/
COPY --from=go-md2man / /usr/local/
ARG name
ARG version
RUN <<EOF
Expand Down
2 changes: 1 addition & 1 deletion tools/bypass4netns/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion tools/cnitool/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/containernetworking/cni
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/containerd/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-md2man / /
COPY --link --from=go-md2man / /usr/local/
ARG name
ARG version
COPY 10-containerd-net.conflist "${prefix}/etc/cni/net.d/"
Expand Down
2 changes: 1 addition & 1 deletion tools/containers-common/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-md2man / /
COPY --link --from=go-md2man / /usr/local/
ARG name
ARG version
RUN <<EOF
Expand Down
4 changes: 2 additions & 2 deletions tools/cri-o/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=cosign / /
COPY --from=go-md2man / /
COPY --link --from=cosign / /usr/local/
COPY --from=go-md2man / /usr/local/
ARG name
ARG version
COPY crio.conf ${prefix}/etc/crio.conf
Expand Down
4 changes: 2 additions & 2 deletions tools/ct/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/flatcar/container-linux-config-transpiler
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/ct_server/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
ARG name
ARG version
COPY ct_server.service ${prefix}/etc/systemd/system/ct_server.service
Expand Down
6 changes: 3 additions & 3 deletions tools/devcontainer/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
COPY --link --from=python / /usr/local/
COPY --link --from=nodejs / /
COPY --link --from=npm / /
COPY --link --from=make / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
COPY --link --from=make / /usr/local/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions tools/docker-manpages/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ 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-md2man / /
COPY --link --from=go / /usr/local/
COPY --link --from=make / /usr/local/
COPY --link --from=go-md2man / /usr/local/
WORKDIR /go/src/github.com/docker/cli
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/docuum/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=rust / /
COPY --from=rust / /usr/local/
ARG DEBIAN_FRONTEND=noninteractive
RUN <<EOF
apt-get update
Expand Down
4 changes: 2 additions & 2 deletions tools/dot/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions tools/emoj/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ 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 / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
WORKDIR ${prefix}/libexec/emoj
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/emojisum/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/emojisum/emojisum
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/gitsign/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
COPY gitsign-credential-cache.sh ${prefix}/etc/profile.d/
Expand Down
4 changes: 2 additions & 2 deletions tools/go-md2man/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 $GOPATH/src/github.com/cpuguy83/go-md2man
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/goreleaser/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
WORKDIR /tmp/goreleaser
ARG name
ARG version
Expand Down
4 changes: 2 additions & 2 deletions tools/grunt/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ 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 / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
WORKDIR ${prefix}/libexec/grunt
ARG name
ARG version
Expand Down
4 changes: 2 additions & 2 deletions tools/guac/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=goreleaser / /
COPY --link --from=go / /usr/local/
COPY --link --from=goreleaser / /usr/local/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion tools/helm-plugins/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
SHELL [ "bash", "-clo", "errexit" ]
ARG name
ARG version
COPY --link --from=helm / /
COPY --link --from=helm / /usr/local/
RUN <<EOF
echo "export HELM_PLUGINS=/share/helm/plugins" >"${prefix}/etc/profile.d/helm-plugins.sh"

Expand Down
4 changes: 2 additions & 2 deletions tools/imgcrypt/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/containerd/imgcrypt
ARG name
ARG version
Expand Down
4 changes: 2 additions & 2 deletions tools/in-toto/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/in-toto/in-toto-golang
ARG name
ARG version
Expand Down
6 changes: 3 additions & 3 deletions tools/iptables/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ apt-get -y install --no-install-recommends \
git \
libnfnetlink-dev
EOF
COPY --from=make / /
COPY --from=libmnl / /
COPY --from=libnftnl / /
COPY --from=make / /usr/local/
COPY --from=libmnl / /usr/local/
COPY --from=libnftnl / /usr/local/
WORKDIR /tmp/iptables
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/it-depends/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions tools/jsonata-cli/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=nodejs / /
COPY --link --from=npm / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
ARG name
ARG version
WORKDIR ${prefix}/libexec/jsonata-cli
Expand Down
2 changes: 1 addition & 1 deletion tools/jsonplot/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/jp
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/libmnl/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apt-get -y install --no-install-recommends \
libtool \
build-essential
EOF
COPY --from=make / /
COPY --from=make / /usr/local/
WORKDIR /tmp/libmnl
ARG name
ARG version
Expand Down
4 changes: 2 additions & 2 deletions tools/libnftnl/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ apt-get -y install --no-install-recommends \
build-essential \
pkg-config
EOF
COPY --from=make / /
COPY --from=libmnl / /
COPY --from=make / /usr/local/
COPY --from=libmnl / /usr/local/
WORKDIR /tmp/libnftnl
ARG name
ARG version
Expand Down
2 changes: 1 addition & 1 deletion tools/lz4/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=make / /
COPY --link --from=make / /usr/local/
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions tools/n8n/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=nodejs / /
COPY --link --from=npm / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
WORKDIR ${prefix}/libexec/n8n
ARG name
ARG version
Expand Down
4 changes: 2 additions & 2 deletions tools/newman/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ 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 / /
COPY --link --from=nodejs / /usr/local/
COPY --link --from=npm / /usr/local/
WORKDIR ${prefix}/libexec/newman
ARG name
ARG version
Expand Down
6 changes: 3 additions & 3 deletions tools/nftables/Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ apt-get -y install --no-install-recommends \
libjansson-dev \
pkg-config
EOF
COPY --from=make / /
COPY --from=libmnl / /
COPY --from=libnftnl / /
COPY --from=make / /usr/local/
COPY --from=libmnl / /usr/local/
COPY --from=libnftnl / /usr/local/
WORKDIR /tmp/nftables
ARG name
ARG version
Expand Down
Loading

0 comments on commit c004e6f

Please sign in to comment.