Remove target c

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 <<EOF
 check-github-release-asset "google/cadvisor" "v${version}" "cadvisor-v${version}-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cadvisor" \
+curl --silent --location --fail --output "${prefix}/bin/cadvisor" \
     "https://github.com/google/cadvisor/releases/download/v${version}/cadvisor-v${version}-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cadvisor"
+chmod +x "${prefix}/bin/cadvisor"
 EOF

tools/calicoctl/Dockerfile.template

@@ -1,14 +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 <<EOF
 check-github-release-asset "projectcalico/calico" "v${version}" "calicoctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/calicoctl" \
+curl --silent --location --fail --output "${prefix}/bin/calicoctl" \
     "https://github.com/projectcalico/calico/releases/download/v${version}/calicoctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/calicoctl"
+chmod +x "${prefix}/bin/calicoctl"
 EOF

tools/car/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 <<EOF
 check-github-release-asset "tetratelabs/car" "v${version}" "car_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/tetratelabs/car/releases/download/v${version}/car_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 EOF

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 <<EOF
 check-github-release-asset "microsoft/cascadia-code" "v${version}" "CascadiaCode-${version}.zip"
 url="https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
 mkdir -p \
-    "${prefix}${target}/share/cascadia-code" \
-    "${prefix}${target}/share/fonts/cascadia-code"
-unzip -q -o -d "${prefix}${target}/share/cascadia-code/" "${filename}"
-find "${prefix}${target}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}${target}/share/fonts/cascadia-code" \;
+    "${prefix}/share/cascadia-code" \
+    "${prefix}/share/fonts/cascadia-code"
+unzip -q -o -d "${prefix}/share/cascadia-code/" "${filename}"
+find "${prefix}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}/share/fonts/cascadia-code" \;
 EOF

tools/catatonit/Dockerfile.template

@@ -1,14 +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 <<EOF
 check-github-release-asset "openSUSE/catatonit" "v${version}" "catatonit.${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/catatonit" \
+curl --silent --location --fail --output "${prefix}/bin/catatonit" \
     "https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.${arch}"
-chmod +x "${prefix}${target}/bin/catatonit"
+chmod +x "${prefix}/bin/catatonit"
 EOF

tools/cdebug/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 <<EOF
 check-github-release-asset "iximiuz/cdebug" "v${version}" "cdebug_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/iximiuz/cdebug/releases/download/v${version}/cdebug_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cdebug
 
-"${prefix}${target}/bin/cdebug" completion bash >"${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

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 <<EOF
@@ -11,13 +13,13 @@ check-github-release-asset "projectdiscovery/cdncheck" "v${version}" "cdncheck_$
 url="https://github.com/projectdiscovery/cdncheck/releases/download/v${version}/cdncheck_${version}_linux_${alt_arch}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}" \
+unzip -q -o -d "${prefix}/bin" "${filename}" \
     cdncheck
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${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

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 <<EOF
 npm install \
     --omit=dev \
     "@cyclonedx/cdxgen@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}/bin/"
 EOF

tools/cfssl/Dockerfile.template

@@ -1,17 +1,18 @@
 #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
-
 ARG BINARIES="cfssl-bundle cfssl-certinfo cfssl-newkey cfssl-scan cfssljson cfssl mkbundle multirootca"
 RUN <<EOF
 for BINARY in ${BINARIES}; do
     check-github-release-asset "cloudflare/cfssl" "v${version}" "${BINARY}_${version}_linux_amd64"
-    curl --silent --location --fail --output "${prefix}${target}/bin/${BINARY}" \
+    curl --silent --location --fail --output "${prefix}/bin/${BINARY}" \
         "https://github.com/cloudflare/cfssl/releases/download/v${version}/${BINARY}_${version}_linux_amd64"
-    chmod +x "${prefix}${target}/bin/${BINARY}"
+    chmod +x "${prefix}/bin/${BINARY}"
 done
 EOF

tools/chart-releaser/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 <<EOF
 check-github-release-asset "helm/chart-releaser" "v${version}" "chart-releaser_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-releaser/releases/download/v${version}/chart-releaser_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cr
 
-"${prefix}${target}/bin/cr" completion bash >"${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

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 <<EOF
 check-github-release-asset "helm/chart-testing" "v${version}" "chart-testing_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-testing/releases/download/v${version}/chart-testing_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     ct \
     etc
 mkdir -p "${prefix}/etc/ct"
-mv "${prefix}${target}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
-mv "${prefix}${target}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
-rmdir "${prefix}${target}/bin/etc"
+mv "${prefix}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
+mv "${prefix}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
+rmdir "${prefix}/bin/etc"
 
-"${prefix}${target}/bin/ct" completion bash >"${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

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 <<EOF
 check-github-release-asset "cheat/cheat" "${version}" "cheat-linux-${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/cheat/cheat/releases/download/${version}/cheat-linux-${alt_arch}.gz" \
 | gunzip \
->"${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

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 <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -17,5 +19,5 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/checkov" --console-script checkov "checkov==${version}"
+shiv --output-file "${prefix}/bin/checkov" --console-script checkov "checkov==${version}"
 EOF