Remove target l

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

tools/lazydocker/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 "jesseduffield/lazydocker" "v${version}" "lazydocker_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jesseduffield/lazydocker/releases/download/v${version}/lazydocker_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     lazydocker
 EOF

tools/lazygit/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 "jesseduffield/lazygit" "v${version}" "lazygit_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jesseduffield/lazygit/releases/download/v${version}/lazygit_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     lazygit
 EOF

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

tools/lectl/Dockerfile.template

@@ -1,13 +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 <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/lectl" \
+curl --silent --location --fail --output "${prefix}/bin/lectl" \
     "https://github.com/sahsanu/lectl/raw/v${version}/lectl"
-chmod +x "${prefix}${target}/bin/lectl"
+chmod +x "${prefix}/bin/lectl"
 EOF

tools/libcap-ng/Dockerfile.template

@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b AS build
+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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -20,12 +22,7 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/stevegrubb/libcap-ng .
 ./autogen.sh
-./configure --prefix=/opt/libcap-ng --enable-static --disable-shared --without-python
+./configure --prefix="${prefix}${target}" --enable-static --disable-shared --without-python
 make LDFLAGS=--static
 make install
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /opt/libcap-ng/ ${prefix}${target}/
+EOF

tools/libcap/Dockerfile.template

@@ -1,14 +1,16 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b AS build
+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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
-        build-essential \
-        git \
-        ca-certificates
+    build-essential \
+    git \
+    ca-certificates
 EOF
 WORKDIR /tmp/libcap
 ARG name
@@ -17,19 +19,9 @@ RUN <<EOF
 check-clone https://git.kernel.org/pub/scm/libs/libcap/libcap.git "libcap-${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "libcap-${version}" https://git.kernel.org/pub/scm/libs/libcap/libcap.git .
 make -C progs
-make -C progs install FAKEROOT=/usr/local
-mkdir -p \
-    /usr/local/share/man/man1 \
-    /usr/local/share/man/man8
-cp doc/capsh.1 /usr/local/share/man/man1/
-cp doc/getcap.8 /usr/local/share/man/man8/
-cp doc/getpcaps.8 /usr/local/share/man/man8/
-cp doc/setcap.8 /usr/local/share/man/man8/
-rm /usr/local/man
-rm -f /usr/local/sbin/unminimize
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /usr/local/ ${prefix}${target}/
+make -C progs install
+cp doc/capsh.1 "${prefix}/share/man/man1/"
+cp doc/getcap.8 "${prefix}/share/man/man8/"
+cp doc/getpcaps.8 "${prefix}/share/man/man8/"
+cp doc/setcap.8 "${prefix}/share/man/man8/"
+EOF

tools/libcgroup/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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -15,10 +17,10 @@ apt-get -y install --no-install-recommends \
     flex
 EOF
 RUN <<EOF
-mkdir -p "${prefix}${target}/etc/ld.so.conf.d"
+mkdir -p "${prefix}/etc/ld.so.conf.d"
 EOF
-COPY <<EOF ${prefix}${target}/etc/ld.so.conf.d/libcgroup.conf
-${target}/lib
+COPY <<EOF ${prefix}/etc/ld.so.conf.d/libcgroup.conf
+/lib
 EOF
 WORKDIR /tmp/libcgroup
 ARG name
@@ -27,7 +29,7 @@ ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz" \
 | tar --extract --gzip --strip-components 1
-./configure --prefix="${prefix}${target}" --disable-pam --disable-daemon
+./configure --prefix="${prefix}" --disable-pam --disable-daemon
 make
 make install
 EOF

tools/libmnl/Dockerfile.template

@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -24,7 +26,7 @@ git clone --config advice.detachedHead=false --depth 1 --branch "libmnl-${versio
 EOF
 RUN <<EOF
 ./autogen.sh
-./configure --prefix="${prefix}${target}"
+./configure --prefix="${prefix}"
 make
 make install
 EOF

tools/libnftnl/Dockerfile.template

@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/make:latest AS make
+FROM ghcr.io/uniget-org/tools/libmnl:latest AS libmnl
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-FROM ghcr.io/uniget-org/tools/libmnl:${ref} AS libmnl
-
-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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -26,9 +28,9 @@ check-clone "https://git.netfilter.org/libnftnl" "libnftnl-${version}"
 git clone --config advice.detachedHead=false --depth 1 --branch "libnftnl-${version}" git://git.netfilter.org/libnftnl .
 EOF
 RUN <<EOF
-export PKG_CONFIG_PATH="${target}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+export PKG_CONFIG_PATH="/lib/pkgconfig:${PKG_CONFIG_PATH}"
 ./autogen.sh
-./configure --prefix="${prefix}${target}" --enable-static=yes --enable-shared=yes
+./configure --prefix="${prefix}" --enable-static=yes --enable-shared=yes
 make
 make install
 EOF

tools/lima/Dockerfile.template

@@ -1,18 +1,20 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/yasu:latest AS yasu
 
-FROM ghcr.io/uniget-org/tools/yasu:${ref} AS yasu
-
-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=yasu / /
+COPY --from=yasu / /usr/local/
 RUN <<EOF
 check-github-release-asset "lima-vm/lima" "v${version}" "lima-${version}-Linux-${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-Linux-${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
-yasu nobody "${prefix}${target}/bin/limactl" completion bash >"${prefix}${target}/share/bash-completion/completions/limactl"
-yasu nobody "${prefix}${target}/bin/limactl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/limactl.fish"
-yasu nobody "${prefix}${target}/bin/limactl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_limactl"
+| tar --extract --gzip --directory="${prefix}" --no-same-owner
+yasu nobody "${prefix}/bin/limactl" completion bash >"${prefix}/share/bash-completion/completions/limactl"
+yasu nobody "${prefix}/bin/limactl" completion fish >"${prefix}/share/fish/vendor_completions.d/limactl.fish"
+yasu nobody "${prefix}/bin/limactl" completion zsh >"${prefix}/share/zsh/vendor-completions/_limactl"
 EOF

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

tools/localizer/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 "getoutreach/localizer" "v${version}" "localizer_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/getoutreach/localizer/releases/download/v${version}/localizer_${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 \
     localizer
 EOF

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