From 43d7ee1bae166e3c9edb41b6bc8c4128cbec03fa Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 11:48:39 +0100
Subject: [PATCH] Remove target for b* #2213

---
 tools/bandwhich/Dockerfile.template    |  8 +++++---
 tools/bat/Dockerfile.template          |  8 +++++---
 tools/bif/Dockerfile.template          |  8 +++++---
 tools/bin/Dockerfile.template          |  8 +++++---
 tools/blincus/Dockerfile.template      |  8 +++++---
 tools/bogrod/Dockerfile.template       | 12 +++++++-----
 tools/bom/Dockerfile.template          |  8 +++++---
 tools/bomber/Dockerfile.template       |  8 +++++---
 tools/bomshell/Dockerfile.template     |  8 +++++---
 tools/bubblewrap/Dockerfile.template   |  8 +++++---
 tools/buildah/Dockerfile.template      | 14 ++++++++------
 tools/buildg/Dockerfile.template       |  9 +++++----
 tools/buildkit/Dockerfile.template     |  8 +++++---
 tools/buildx/Dockerfile.template       |  9 +++++----
 tools/bumblebee/Dockerfile.template    |  9 +++++----
 tools/bypass4netns/Dockerfile.template | 10 ++++++----
 16 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/tools/bandwhich/Dockerfile.template b/tools/bandwhich/Dockerfile.template
index 9a25396bb..30ef3ef41 100644
--- a/tools/bandwhich/Dockerfile.template
+++ b/tools/bandwhich/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
diff --git a/tools/bat/Dockerfile.template b/tools/bat/Dockerfile.template
index 2df0a412a..4ade1ffa0 100644
--- a/tools/bat/Dockerfile.template
+++ b/tools/bat/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" ]
 WORKDIR /tmp/bat
 ARG name
 ARG version
diff --git a/tools/bif/Dockerfile.template b/tools/bif/Dockerfile.template
index 539691c5a..569281668 100644
--- a/tools/bif/Dockerfile.template
+++ b/tools/bif/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
diff --git a/tools/bin/Dockerfile.template b/tools/bin/Dockerfile.template
index a1f97d074..82b0cec6e 100644
--- a/tools/bin/Dockerfile.template
+++ b/tools/bin/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
diff --git a/tools/blincus/Dockerfile.template b/tools/blincus/Dockerfile.template
index 2bda9d845..c751a809a 100644
--- a/tools/blincus/Dockerfile.template
+++ b/tools/blincus/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
diff --git a/tools/bogrod/Dockerfile.template b/tools/bogrod/Dockerfile.template
index 3f3932d75..1225e8830 100644
--- a/tools/bogrod/Dockerfile.template
+++ b/tools/bogrod/Dockerfile.template
@@ -1,11 +1,13 @@
 #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 / /
 COPY --link --from=shiv / /
 RUN <<EOF
diff --git a/tools/bom/Dockerfile.template b/tools/bom/Dockerfile.template
index 39b7e1fec..91f0502f2 100644
--- a/tools/bom/Dockerfile.template
+++ b/tools/bom/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
diff --git a/tools/bomber/Dockerfile.template b/tools/bomber/Dockerfile.template
index a9338db9d..5c8eb2a24 100644
--- a/tools/bomber/Dockerfile.template
+++ b/tools/bomber/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
diff --git a/tools/bomshell/Dockerfile.template b/tools/bomshell/Dockerfile.template
index 93371ac2d..26708b837 100644
--- a/tools/bomshell/Dockerfile.template
+++ b/tools/bomshell/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
diff --git a/tools/bubblewrap/Dockerfile.template b/tools/bubblewrap/Dockerfile.template
index c63fc4a28..821af3cb3 100644
--- a/tools/bubblewrap/Dockerfile.template
+++ b/tools/bubblewrap/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 \
diff --git a/tools/buildah/Dockerfile.template b/tools/buildah/Dockerfile.template
index a874bbd83..22856e2ab 100644
--- a/tools/buildah/Dockerfile.template
+++ b/tools/buildah/Dockerfile.template
@@ -1,12 +1,14 @@
 #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-md2man:latest AS go-md2man
 
-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/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" ]
 COPY --from=go / /
 COPY --from=make / /
 COPY --from=go-md2man / /
diff --git a/tools/buildg/Dockerfile.template b/tools/buildg/Dockerfile.template
index b8830834b..f5b3d0f2d 100644
--- a/tools/buildg/Dockerfile.template
+++ b/tools/buildg/Dockerfile.template
@@ -1,11 +1,12 @@
 #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 "ktock/buildg" "v${version}" "buildg-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ktock/buildg/releases/download/v${version}/buildg-v${version}-linux-${alt_arch}.tar.gz" \
diff --git a/tools/buildkit/Dockerfile.template b/tools/buildkit/Dockerfile.template
index 7f55ed560..68af9d750 100644
--- a/tools/buildkit/Dockerfile.template
+++ b/tools/buildkit/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
 COPY init-buildkit "${prefix}${target}/etc/init.d/buildkit"
diff --git a/tools/buildx/Dockerfile.template b/tools/buildx/Dockerfile.template
index 0d76fa8a3..04e61961e 100644
--- a/tools/buildx/Dockerfile.template
+++ b/tools/buildx/Dockerfile.template
@@ -1,11 +1,12 @@
 #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 "docker/buildx" "v${version}" "buildx-v${version}.linux-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-buildx" \
diff --git a/tools/bumblebee/Dockerfile.template b/tools/bumblebee/Dockerfile.template
index a8db7b339..4707b993d 100644
--- a/tools/bumblebee/Dockerfile.template
+++ b/tools/bumblebee/Dockerfile.template
@@ -1,11 +1,12 @@
 #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 "solo-io/bumblebee" "v${version}" "bee-linux-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/bee" \
diff --git a/tools/bypass4netns/Dockerfile.template b/tools/bypass4netns/Dockerfile.template
index 3e6c78795..fb4cba8f4 100644
--- a/tools/bypass4netns/Dockerfile.template
+++ b/tools/bypass4netns/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/go:${ref} AS go
-
-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=go / /
 RUN <<EOF
 apt-get update