diff --git a/tools/cadvisor/Dockerfile.template b/tools/cadvisor/Dockerfile.template index 488050a430..2cee780ad8 100644 --- a/tools/cadvisor/Dockerfile.template +++ b/tools/cadvisor/Dockerfile.template @@ -1,13 +1,15 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cas" -"${prefix}${target}/bin/cas" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cas.fish" -"${prefix}${target}/bin/cas" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cas" -EOF \ No newline at end of file diff --git a/tools/cas/manifest.yaml b/tools/cas/manifest.yaml deleted file mode 100644 index 53676c160b..0000000000 --- a/tools/cas/manifest.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: cas -version: "1.0.3" -check: ${binary} --version | cut -d' ' -f3 | tr -d v -tags: -- type/cli -- category/security -- cicd -- lang/go -homepage: https://github.com/codenotary/cas -description: Codenotary Community Attestation Service (CAS) for notarization and authentication of digital artifacts -renovate: - datasource: github-releases - package: codenotary/cas - extractVersion: ^v(?.+?)$ - priority: low diff --git a/tools/cascadia-code/Dockerfile.template b/tools/cascadia-code/Dockerfile.template index f80f0537ef..fcce85f31b 100644 --- a/tools/cascadia-code/Dockerfile.template +++ b/tools/cascadia-code/Dockerfile.template @@ -1,19 +1,20 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare - +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version - RUN <"${prefix}${target}/share/bash-completion/completions/cdebug" -"${prefix}${target}/bin/cdebug" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cdebug.fish" -"${prefix}${target}/bin/cdebug" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cdebug" +"${prefix}/bin/cdebug" completion bash >"${prefix}/share/bash-completion/completions/cdebug" +"${prefix}/bin/cdebug" completion fish >"${prefix}/share/fish/vendor_completions.d/cdebug.fish" +"${prefix}/bin/cdebug" completion zsh >"${prefix}/share/zsh/vendor-completions/_cdebug" EOF diff --git a/tools/cdncheck/Dockerfile.template b/tools/cdncheck/Dockerfile.template index 05fd46e047..eadc8ba0c6 100644 --- a/tools/cdncheck/Dockerfile.template +++ b/tools/cdncheck/Dockerfile.template @@ -1,8 +1,10 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/foo" -#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish" -#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo" +#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo" +#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish" +#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo" #EOF \ No newline at end of file diff --git a/tools/cdxgen/Dockerfile.template b/tools/cdxgen/Dockerfile.template index dd3d8126f4..e2169c0afe 100644 --- a/tools/cdxgen/Dockerfile.template +++ b/tools/cdxgen/Dockerfile.template @@ -1,21 +1,23 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main +FROM ghcr.io/uniget-org/tools/nodejs:latest AS nodejs +FROM ghcr.io/uniget-org/tools/npm:latest AS npm -FROM ghcr.io/uniget-org/tools/nodejs:${ref} AS nodejs -FROM ghcr.io/uniget-org/tools/npm:${ref} AS npm - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version -COPY --link --from=nodejs / / -COPY --link --from=npm / / -WORKDIR ${prefix}${target}/libexec/cdxgen +COPY --link --from=nodejs / /usr/local/ +COPY --link --from=npm / /usr/local/ +WORKDIR /uniget_bootstrap/libexec/cdxgen ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cr" -"${prefix}${target}/bin/cr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cr.fish" -"${prefix}${target}/bin/cr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cr" +"${prefix}/bin/cr" completion bash >"${prefix}/share/bash-completion/completions/cr" +"${prefix}/bin/cr" completion fish >"${prefix}/share/fish/vendor_completions.d/cr.fish" +"${prefix}/bin/cr" completion zsh >"${prefix}/share/zsh/vendor-completions/_cr" EOF diff --git a/tools/chart-testing/Dockerfile.template b/tools/chart-testing/Dockerfile.template index 004938697c..fdca40ecde 100644 --- a/tools/chart-testing/Dockerfile.template +++ b/tools/chart-testing/Dockerfile.template @@ -1,22 +1,24 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/ct" -"${prefix}${target}/bin/ct" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/ct.fish" -"${prefix}${target}/bin/ct" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_ct" +"${prefix}/bin/ct" completion bash >"${prefix}/share/bash-completion/completions/ct" +"${prefix}/bin/ct" completion fish >"${prefix}/share/fish/vendor_completions.d/ct.fish" +"${prefix}/bin/ct" completion zsh >"${prefix}/share/zsh/vendor-completions/_ct" EOF diff --git a/tools/cheat/Dockerfile.template b/tools/cheat/Dockerfile.template index c507660f4e..bbf5dc8137 100644 --- a/tools/cheat/Dockerfile.template +++ b/tools/cheat/Dockerfile.template @@ -1,18 +1,19 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare - +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version - RUN <"${prefix}${target}/bin/cheat" -chmod +x "${prefix}${target}/bin/cheat" +>"${prefix}/bin/cheat" +chmod +x "${prefix}/bin/cheat" -curl --silent --location --fail --output "${prefix}${target}/share/man/man1/cheat.1" \ +curl --silent --location --fail --output "${prefix}/share/man/man1/cheat.1" \ "https://github.com/cheat/cheat/raw/${version}/doc/cheat.1" EOF \ No newline at end of file diff --git a/tools/checkov/Dockerfile.template b/tools/checkov/Dockerfile.template index dbbccf7b02..c155e8eceb 100644 --- a/tools/checkov/Dockerfile.template +++ b/tools/checkov/Dockerfile.template @@ -1,13 +1,15 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main +#FROM ghcr.io/uniget-org/tools/python:latest AS python +FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv -#FROM ghcr.io/uniget-org/tools/python:${ref} AS python -FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] #COPY --link --from=python / /usr/local/ -COPY --link --from=shiv / / +COPY --link --from=shiv / /usr/local/ RUN <"${prefix}${target}/share/bash-completion/completions/chekr" -"${prefix}${target}/bin/chekr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/chekr.fish" -"${prefix}${target}/bin/chekr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_chekr" +"${prefix}/bin/chekr" completion bash >"${prefix}/share/bash-completion/completions/chekr" +"${prefix}/bin/chekr" completion fish >"${prefix}/share/fish/vendor_completions.d/chekr.fish" +"${prefix}/bin/chekr" completion zsh >"${prefix}/share/zsh/vendor-completions/_chekr" EOF \ No newline at end of file diff --git a/tools/chigo/Dockerfile.template b/tools/chigo/Dockerfile.template index 4f0259d04a..4ee3b0a0a1 100644 --- a/tools/chigo/Dockerfile.template +++ b/tools/chigo/Dockerfile.template @@ -1,15 +1,16 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare - +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version - RUN <"${prefix}${target}/bin/chisel" -chmod +x "${prefix}${target}/bin/chisel" +>"${prefix}/bin/chisel" +chmod +x "${prefix}/bin/chisel" EOF \ No newline at end of file diff --git a/tools/cilium/Dockerfile.template b/tools/cilium/Dockerfile.template index 02097f8cff..3cf3e311dd 100644 --- a/tools/cilium/Dockerfile.template +++ b/tools/cilium/Dockerfile.template @@ -1,15 +1,17 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cilium" -"${prefix}${target}/bin/cilium" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cilium.fish" -"${prefix}${target}/bin/cilium" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cilium" +| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner +"${prefix}/bin/cilium" completion bash >"${prefix}/share/bash-completion/completions/cilium" +"${prefix}/bin/cilium" completion fish >"${prefix}/share/fish/vendor_completions.d/cilium.fish" +"${prefix}/bin/cilium" completion zsh >"${prefix}/share/zsh/vendor-completions/_cilium" EOF \ No newline at end of file diff --git a/tools/cinf/Dockerfile.template b/tools/cinf/Dockerfile.template index 34c03e1cde..5fea0a344e 100644 --- a/tools/cinf/Dockerfile.template +++ b/tools/cinf/Dockerfile.template @@ -1,7 +1,10 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version @@ -9,6 +12,6 @@ ARG version RUN <"${prefix}${target}/share/bash-completion/completions/clusterawsadm" -"${prefix}${target}/bin/clusterawsadm" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/clusterawsadm.fish" -"${prefix}${target}/bin/clusterawsadm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterawsadm" +chmod +x "${prefix}/bin/clusterawsadm" +"${prefix}/bin/clusterawsadm" completion bash >"${prefix}/share/bash-completion/completions/clusterawsadm" +"${prefix}/bin/clusterawsadm" completion fish >"${prefix}/share/fish/vendor_completions.d/clusterawsadm.fish" +"${prefix}/bin/clusterawsadm" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterawsadm" EOF \ No newline at end of file diff --git a/tools/clusterctl/Dockerfile.template b/tools/clusterctl/Dockerfile.template index 7034f767b2..b9a0d662d4 100644 --- a/tools/clusterctl/Dockerfile.template +++ b/tools/clusterctl/Dockerfile.template @@ -1,15 +1,17 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/clusterctl" -"${prefix}${target}/bin/clusterctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterctl" +chmod +x "${prefix}/bin/clusterctl" +"${prefix}/bin/clusterctl" completion bash >"${prefix}/share/bash-completion/completions/clusterctl" +"${prefix}/bin/clusterctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterctl" EOF \ No newline at end of file diff --git a/tools/clusterlint/Dockerfile.template b/tools/clusterlint/Dockerfile.template index 4fe5c209fc..7f91b68cdb 100644 --- a/tools/clusterlint/Dockerfile.template +++ b/tools/clusterlint/Dockerfile.template @@ -1,12 +1,14 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cmctl" -"${prefix}${target}/bin/cmctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cmctl.fish" -"${prefix}${target}/bin/cmctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cmctl" +"${prefix}/bin/cmctl" completion bash >"${prefix}/share/bash-completion/completions/cmctl" +"${prefix}/bin/cmctl" completion fish >"${prefix}/share/fish/vendor_completions.d/cmctl.fish" +"${prefix}/bin/cmctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_cmctl" EOF \ No newline at end of file diff --git a/tools/cni/Dockerfile.template b/tools/cni/Dockerfile.template index a8e3feb5a8..32ad25e400 100644 --- a/tools/cni/Dockerfile.template +++ b/tools/cni/Dockerfile.template @@ -1,17 +1,19 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/colima" -"${prefix}${target}/bin/colima" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/colima.fish" -"${prefix}${target}/bin/colima" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_colima" +chmod +x "${prefix}/bin/colima" +"${prefix}/bin/colima" completion bash >"${prefix}/share/bash-completion/completions/colima" +"${prefix}/bin/colima" completion fish >"${prefix}/share/fish/vendor_completions.d/colima.fish" +"${prefix}/bin/colima" completion zsh >"${prefix}/share/zsh/vendor-completions/_colima" EOF \ No newline at end of file diff --git a/tools/composerize/Dockerfile.template b/tools/composerize/Dockerfile.template index c773505726..a310bc66df 100644 --- a/tools/composerize/Dockerfile.template +++ b/tools/composerize/Dockerfile.template @@ -1,21 +1,23 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main +FROM ghcr.io/uniget-org/tools/nodejs:latest AS nodejs +FROM ghcr.io/uniget-org/tools/npm:latest AS npm -FROM ghcr.io/uniget-org/tools/nodejs:${ref} AS nodejs -FROM ghcr.io/uniget-org/tools/npm:${ref} AS npm - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version -COPY --link --from=nodejs / / -COPY --link --from=npm / / -WORKDIR ${prefix}${target}/libexec/composerize +COPY --link --from=nodejs / /usr/local/ +COPY --link --from=npm / /usr/local/ +WORKDIR /uniget_bootstrap/libexec/composerize ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/fly" -"${prefix}${target}/bin/fly" completion --shell=zsh >"${prefix}${target}/share/zsh/vendor-completions/_fly" +"${prefix}/bin/fly" completion --shell=bash >"${prefix}/share/bash-completion/completions/fly" +"${prefix}/bin/fly" completion --shell=zsh >"${prefix}/share/zsh/vendor-completions/_fly" EOF \ No newline at end of file diff --git a/tools/conftest/Dockerfile.template b/tools/conftest/Dockerfile.template index 0c7400f2aa..72e6e9da43 100644 --- a/tools/conftest/Dockerfile.template +++ b/tools/conftest/Dockerfile.template @@ -1,7 +1,10 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version @@ -9,9 +12,9 @@ ARG version RUN <"${prefix}${target}/share/bash-completion/completions/conftest" -"${prefix}${target}/bin/conftest" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/conftest.fish" -"${prefix}${target}/bin/conftest" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_conftest" +"${prefix}/bin/conftest" completion bash >"${prefix}/share/bash-completion/completions/conftest" +"${prefix}/bin/conftest" completion fish >"${prefix}/share/fish/vendor_completions.d/conftest.fish" +"${prefix}/bin/conftest" completion zsh >"${prefix}/share/zsh/vendor-completions/_conftest" EOF \ No newline at end of file diff --git a/tools/conmon/Dockerfile.template b/tools/conmon/Dockerfile.template index ee7a8b9072..e0a2fddf05 100644 --- a/tools/conmon/Dockerfile.template +++ b/tools/conmon/Dockerfile.template @@ -1,10 +1,12 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main +FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man -FROM ghcr.io/uniget-org/tools/go-md2man:${ref} AS go-md2man - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/copa" -"${prefix}${target}/bin/copa" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/copa.fish" -"${prefix}${target}/bin/copa" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_copa" +"${prefix}/bin/copa" completion bash >"${prefix}/share/bash-completion/completions/copa" +"${prefix}/bin/copa" completion fish >"${prefix}/share/fish/vendor_completions.d/copa.fish" +"${prefix}/bin/copa" completion zsh >"${prefix}/share/zsh/vendor-completions/_copa" EOF \ No newline at end of file diff --git a/tools/cosign/Dockerfile.template b/tools/cosign/Dockerfile.template index dec35c26b0..bab01a861e 100644 --- a/tools/cosign/Dockerfile.template +++ b/tools/cosign/Dockerfile.template @@ -1,8 +1,6 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS cosign-bootstrap +FROM ghcr.io/uniget-org/tools/base:latest AS cosign-bootstrap ARG TARGETPLATFORM # renovate: datasource=github-releases depName=sigstore/cosign ARG COSIGN_VERSION=2.1.1 @@ -21,27 +19,31 @@ mv "cosign-linux-${alt_arch}" /usr/local/bin/cosign cosign version EOF -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] COPY --link --from=cosign-bootstrap /usr/local/bin/cosign /usr/local/bin/ ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cosign" -"${prefix}${target}/bin/cosign" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cosign.fish" -"${prefix}${target}/bin/cosign" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cosign" +"${prefix}/bin/cosign" completion bash >"${prefix}/share/bash-completion/completions/cosign" +"${prefix}/bin/cosign" completion fish >"${prefix}/share/fish/vendor_completions.d/cosign.fish" +"${prefix}/bin/cosign" completion zsh >"${prefix}/share/zsh/vendor-completions/_cosign" echo "### Checking PGP signature for cosign ${version}" curl --silent --location --fail --output "cosign-linux-${alt_arch}.sig" \ "https://github.com/sigstore/cosign/releases/download/v${version}/cosign-linux-${alt_arch}.sig" COSIGN_PUB_KEY="https://github.com/sigstore/cosign/releases/download/v${version}/release-cosign.pub" -cosign verify-blob --key "${COSIGN_PUB_KEY}" --signature "cosign-linux-${alt_arch}.sig" "${prefix}${target}/bin/cosign" +cosign verify-blob --key "${COSIGN_PUB_KEY}" --signature "cosign-linux-${alt_arch}.sig" "${prefix}/bin/cosign" rm -f "cosign-linux-${alt_arch}.sig" echo "### Checking keyless signature for cosign ${version}" @@ -54,8 +56,8 @@ COSIGN_EXPERIMENTAL=1 cosign verify-blob \ --signature "cosign-linux-${alt_arch}-keyless.sig" \ --certificate-oidc-issuer https://accounts.google.com \ --certificate-identity "keyless@projectsigstore.iam.gserviceaccount.com" \ - "${prefix}${target}/bin/cosign" + "${prefix}/bin/cosign" rm -f "cosign-linux-${alt_arch}-keyless.pem" "cosign-linux-${alt_arch}-keyless.sig" -"${prefix}${target}/bin/cosign" version +"${prefix}/bin/cosign" version EOF \ No newline at end of file diff --git a/tools/cowsay/Dockerfile.template b/tools/cowsay/Dockerfile.template index 8eb930bcd8..cfe1cfa32c 100644 --- a/tools/cowsay/Dockerfile.template +++ b/tools/cowsay/Dockerfile.template @@ -1,7 +1,10 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version @@ -9,12 +12,12 @@ ARG version RUN <"${prefix}${target}/share/bash-completion/completions/crane" -"${prefix}${target}/bin/crane" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/crane.fish" -"${prefix}${target}/bin/crane" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_crane" +"${prefix}/bin/crane" completion bash >"${prefix}/share/bash-completion/completions/crane" +"${prefix}/bin/crane" completion fish >"${prefix}/share/fish/vendor_completions.d/crane.fish" +"${prefix}/bin/crane" completion zsh >"${prefix}/share/zsh/vendor-completions/_crane" EOF \ No newline at end of file diff --git a/tools/cri-dockerd/Dockerfile.template b/tools/cri-dockerd/Dockerfile.template index f4fc7c434d..b4d7556dba 100644 --- a/tools/cri-dockerd/Dockerfile.template +++ b/tools/cri-dockerd/Dockerfile.template @@ -1,18 +1,20 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/cue" -"${prefix}${target}/bin/cue" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cue.fish" -"${prefix}${target}/bin/cue" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cue" +"${prefix}/bin/cue" completion bash >"${prefix}/share/bash-completion/completions/cue" +"${prefix}/bin/cue" completion fish >"${prefix}/share/fish/vendor_completions.d/cue.fish" +"${prefix}/bin/cue" completion zsh >"${prefix}/share/zsh/vendor-completions/_cue" EOF \ No newline at end of file diff --git a/tools/curl/Dockerfile.template b/tools/curl/Dockerfile.template index a645f85e5d..437977dbd4 100644 --- a/tools/curl/Dockerfile.template +++ b/tools/curl/Dockerfile.template @@ -1,7 +1,5 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 AS build WORKDIR /tmp/curl ARG name @@ -43,7 +41,11 @@ mkdir -p /usr/local/share/man/man1/ cp docs/curl.1 /usr/local/share/man/man1/ EOF -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version -COPY --from=build /usr/local/ ${prefix}${target}/ \ No newline at end of file +COPY --from=build /usr/local/ ${prefix}/ \ No newline at end of file diff --git a/tools/curlie/Dockerfile.template b/tools/curlie/Dockerfile.template index 3edbbc5bd1..bea8998525 100644 --- a/tools/curlie/Dockerfile.template +++ b/tools/curlie/Dockerfile.template @@ -1,13 +1,15 @@ #syntax=docker/dockerfile:1.6.0 -ARG ref=main - -FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare +FROM nicholasdille/ubuntu:22.04 AS prepare +COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ + /etc/profile.d/ \ + /etc/profile.d/ +SHELL [ "bash", "-clo", "errexit" ] ARG name ARG version RUN <