Remove target k

tools/k0s/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 "k0sproject/k0s" "v${version}" "k0s-v${version}-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k0s" \
+curl --silent --location --fail --output "${prefix}/bin/k0s" \
     "https://github.com/k0sproject/k0s/releases/download/v${version}/k0s-v${version}-${alt_arch}"
-chmod +x "${prefix}${target}/bin/k0s"
+chmod +x "${prefix}/bin/k0s"
 
-"${prefix}${target}/bin/k0s" completion bash >"${prefix}${target}/share/bash-completion/completions/k0s"
-"${prefix}${target}/bin/k0s" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k0s.fish"
-"${prefix}${target}/bin/k0s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k0s"
+"${prefix}/bin/k0s" completion bash >"${prefix}/share/bash-completion/completions/k0s"
+"${prefix}/bin/k0s" completion fish >"${prefix}/share/fish/vendor_completions.d/k0s.fish"
+"${prefix}/bin/k0s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k0s"
 EOF

tools/k0sctl/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
@@ -21,11 +23,11 @@ case "${arch}" in
 esac
 echo "    Using ${arch_suffix}"
 check-github-release-asset "k0sproject/k0sctl" "v${version}" "k0sctl-linux-${arch_suffix}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k0sctl" \
+curl --silent --location --fail --output "${prefix}/bin/k0sctl" \
     "https://github.com/k0sproject/k0sctl/releases/download/v${version}/k0sctl-linux-${arch_suffix}"
-chmod +x "${prefix}${target}/bin/k0sctl"
+chmod +x "${prefix}/bin/k0sctl"
 
-"${prefix}${target}/bin/k0sctl" completion bash >"${prefix}${target}/share/bash-completion/completions/k0sctl"
-"${prefix}${target}/bin/k0sctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k0sctl.fish"
-"${prefix}${target}/bin/k0sctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k0sctl"
+"${prefix}/bin/k0sctl" completion bash >"${prefix}/share/bash-completion/completions/k0sctl"
+"${prefix}/bin/k0sctl" completion fish >"${prefix}/share/fish/vendor_completions.d/k0sctl.fish"
+"${prefix}/bin/k0sctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_k0sctl"
 EOF

tools/k2d/Dockerfile.template

@@ -1,18 +1,20 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/go:${ref} AS go
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-COPY --link --from=go / /
-COPY --link --from=make / /
+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=go / /usr/local/
+COPY --link --from=make / /usr/local/
 WORKDIR /go/src/github.com/portainer/k2d
 ARG name
 ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/portainer/k2d .
 make release
-cp dist/k2d "${prefix}${target}/bin/"
+cp dist/k2d "${prefix}/bin/"
 EOF

tools/k2d/manifest.yaml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
 $schema: https://tools.uniget.dev/schema.yaml
 name: k2d
-version: "1.0.0-beta"
+version: "1.0.0"
 check: "" # No version parameter
 build_dependencies:
 - go

tools/k3d/Dockerfile.template

@@ -1,16 +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
 RUN <<EOF
 check-github-release-asset "rancher/k3d" "v${version}" "k3d-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3d" \
+curl --silent --location --fail --output "${prefix}/bin/k3d" \
     "https://github.com/rancher/k3d/releases/download/v${version}/k3d-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/k3d"
-"${prefix}${target}/bin/k3d" completion bash >"${prefix}${target}/share/bash-completion/completions/k3d"
-"${prefix}${target}/bin/k3d" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k3d.fish"
-"${prefix}${target}/bin/k3d" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3d"
+chmod +x "${prefix}/bin/k3d"
+"${prefix}/bin/k3d" completion bash >"${prefix}/share/bash-completion/completions/k3d"
+"${prefix}/bin/k3d" completion fish >"${prefix}/share/fish/vendor_completions.d/k3d.fish"
+"${prefix}/bin/k3d" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3d"
 EOF

tools/k3s/Dockerfile.template

@@ -1,11 +1,13 @@
 #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
-COPY k3s.service ${prefix}${target}/etc/systemd/system/
+COPY k3s.service ${prefix}/etc/systemd/system/
 RUN <<EOF
 echo "### Setting architecture string for ${TARGETPLATFORM}"
 case "${arch}" in
@@ -25,9 +27,9 @@ echo "    Using ${arch_suffix}"
 check-github-release-asset "k3s-io/k3s" "v${version}" "k3s${arch_suffix}"
 
 echo "### Downloading ${name} ${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3s" \
+curl --silent --location --fail --output "${prefix}/bin/k3s" \
     "https://github.com/k3s-io/k3s/releases/download/v${version}/k3s${arch_suffix}"
-chmod +x "${prefix}${target}/bin/k3s"
-"${prefix}${target}/bin/k3s" completion bash >"${prefix}${target}/share/bash-completion/completions/k3s"
-"${prefix}${target}/bin/k3s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3s"
+chmod +x "${prefix}/bin/k3s"
+"${prefix}/bin/k3s" completion bash >"${prefix}/share/bash-completion/completions/k3s"
+"${prefix}/bin/k3s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3s"
 EOF

tools/k3sup/Dockerfile.template

@@ -1,16 +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
 RUN <<EOF
 check-github-release-asset "alexellis/k3sup" "${version}" "k3sup"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3sup" \
+curl --silent --location --fail --output "${prefix}/bin/k3sup" \
     "https://github.com/alexellis/k3sup/releases/download/${version}/k3sup"
-chmod +x "${prefix}${target}/bin/k3sup"
-"${prefix}${target}/bin/k3sup" completion bash >"${prefix}${target}/share/bash-completion/completions/k3sup"
-"${prefix}${target}/bin/k3sup" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k3sup.fish"
-"${prefix}${target}/bin/k3sup" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3sup"
+chmod +x "${prefix}/bin/k3sup"
+"${prefix}/bin/k3sup" completion bash >"${prefix}/share/bash-completion/completions/k3sup"
+"${prefix}/bin/k3sup" completion fish >"${prefix}/share/fish/vendor_completions.d/k3sup.fish"
+"${prefix}/bin/k3sup" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3sup"
 EOF

tools/k6/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 <<EOF
 check-github-release-asset "grafana/k6" "v${version}" "k6-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/grafana/k6/releases/download/v${version}/k6-v${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner
-"${prefix}${target}/bin/k6" completion bash >"${prefix}${target}/share/bash-completion/completions/k6"
-"${prefix}${target}/bin/k6" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k6.fish"
-"${prefix}${target}/bin/k6" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k6"
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner
+"${prefix}/bin/k6" completion bash >"${prefix}/share/bash-completion/completions/k6"
+"${prefix}/bin/k6" completion fish >"${prefix}/share/fish/vendor_completions.d/k6.fish"
+"${prefix}/bin/k6" completion zsh >"${prefix}/share/zsh/vendor-completions/_k6"
 EOF

tools/k8s-tew/Dockerfile.template

@@ -1,16 +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
 RUN <<EOF
 check-github-release-asset "darxkies/k8s-tew" "${version}" "k8s-tew"
-curl --silent --location --fail --output "${prefix}${target}/bin/k8s-tew" \
+curl --silent --location --fail --output "${prefix}/bin/k8s-tew" \
     "https://github.com/darxkies/k8s-tew/releases/download/${version}/k8s-tew"
-chmod +x "${prefix}${target}/bin/k8s-tew"
+chmod +x "${prefix}/bin/k8s-tew"
 
-"${prefix}${target}/bin/k8s-tew" completion bash >"${prefix}${target}/share/bash-completion/completions/k8s-tew"
-"${prefix}${target}/bin/k8s-tew" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k8s-tew"
+"${prefix}/bin/k8s-tew" completion bash >"${prefix}/share/bash-completion/completions/k8s-tew"
+"${prefix}/bin/k8s-tew" completion zsh >"${prefix}/share/zsh/vendor-completions/_k8s-tew"
 EOF

tools/k8spacket/Dockerfile.template

@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM golang:1.21.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 AS build
 RUN <<EOF
 apt-get update
@@ -20,7 +18,11 @@ git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}"
 go build -o /usr/local/bin/k8spacket .
 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/bin/k8spacket ${prefix}${target}/bin/
+COPY --from=build /usr/local/bin/k8spacket ${prefix}/bin/

tools/k9s/Dockerfile.template

@@ -1,16 +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
 RUN <<EOF
 check-github-release-asset "derailed/k9s" "v${version}" "k9s_Linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/derailed/k9s/releases/download/v${version}/k9s_Linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     k9s
-"${prefix}${target}/bin/k9s" completion bash >"${prefix}${target}/share/bash-completion/completions/k9s"
-"${prefix}${target}/bin/k9s" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k9s.fish"
-"${prefix}${target}/bin/k9s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k9s"
+"${prefix}/bin/k9s" completion bash >"${prefix}/share/bash-completion/completions/k9s"
+"${prefix}/bin/k9s" completion fish >"${prefix}/share/fish/vendor_completions.d/k9s.fish"
+"${prefix}/bin/k9s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k9s"
 EOF

tools/kapp/Dockerfile.template

@@ -1,16 +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
 RUN <<EOF
 check-github-release-asset "carvel-dev/kapp" "v${version}" "kapp-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kapp" \
+curl --silent --location --fail --output "${prefix}/bin/kapp" \
     "https://github.com/carvel-dev/kapp/releases/download/v${version}/kapp-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kapp"
-"${prefix}${target}/bin/kapp" completion bash >"${prefix}${target}/share/bash-completion/completions/kapp"
-"${prefix}${target}/bin/kapp" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kapp.fish"
-"${prefix}${target}/bin/kapp" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kapp"
+chmod +x "${prefix}/bin/kapp"
+"${prefix}/bin/kapp" completion bash >"${prefix}/share/bash-completion/completions/kapp"
+"${prefix}/bin/kapp" completion fish >"${prefix}/share/fish/vendor_completions.d/kapp.fish"
+"${prefix}/bin/kapp" completion zsh >"${prefix}/share/zsh/vendor-completions/_kapp"
 EOF

tools/katana/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 <<EOF
 check-github-release-asset "projectdiscovery/katana" "v${version}" "katana_${version}_linux_${alt_arch}.zip"
 url="https://github.com/projectdiscovery/katana/releases/download/v${version}/katana_${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}" \
     katana
 EOF

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

tools/kbom/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 "ksoclabs/kbom" "v${version}" "kbom_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ksoclabs/kbom/releases/download/v${version}/kbom_${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 \
     kbom
 
-"${prefix}${target}/bin/kbom" completion bash >"${prefix}${target}/share/bash-completion/completions/kbom"
-"${prefix}${target}/bin/kbom" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kbom.fish"
-"${prefix}${target}/bin/kbom" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kbom"
+"${prefix}/bin/kbom" completion bash >"${prefix}/share/bash-completion/completions/kbom"
+"${prefix}/bin/kbom" completion fish >"${prefix}/share/fish/vendor_completions.d/kbom.fish"
+"${prefix}/bin/kbom" completion zsh >"${prefix}/share/zsh/vendor-completions/_kbom"
 EOF