chore: use one dockerfile for all tools

Author: parisk

docker-bake.hcl

@@ -4,8 +4,12 @@ group "default" {
 
 target "postgres" {
   context = "./tools/postgres"
-  dockerfile = "Dockerfile"
+  dockerfile = "../tool/Dockerfile"
   tags = ["ghcr.io/withlogicco/devcontainers/tools/postgres:latest"]
+  args = {
+    TOOL_NAME = "postgres"
+    TOOL_VERSION = "17.4"
+  }
   contexts = {
     base = "target:base"
     builder = "target:builder"
@@ -14,8 +18,12 @@ target "postgres" {
 
 target "git" {
   context = "./tools/git"
-  dockerfile = "Dockerfile"
+  dockerfile = "../tool/Dockerfile"
   tags = ["ghcr.io/withlogicco/devcontainers/tools/git:latest"]
+  args = {
+    TOOL_NAME = "git"
+    TOOL_VERSION = "2.51.0"
+  }
   contexts = {
     base = "target:base"
     builder = "target:builder"
@@ -24,8 +32,12 @@ target "git" {
 
 target "node" {
   context = "./tools/node"
-  dockerfile = "Dockerfile"
+  dockerfile = "../tool/Dockerfile"
   tags = ["ghcr.io/withlogicco/devcontainers/tools/node:latest"]
+  args = {
+    TOOL_NAME = "node"
+    TOOL_VERSION = "22.18.0"
+  }
   contexts = {
     base = "target:base"
     builder = "target:builder"
@@ -34,8 +46,12 @@ target "node" {
 
 target "zsh" {
   context = "./tools/zsh"
-  dockerfile = "Dockerfile"
+  dockerfile = "../tool/Dockerfile"
   tags = ["ghcr.io/withlogicco/devcontainers/tools/zsh:latest"]
+  args = {
+    TOOL_NAME = "zsh"
+    TOOL_VERSION = "5.9"
+  }
   contexts = {
     base = "target:base"
     builder = "target:builder"

tools/builder/Dockerfile

@@ -1,5 +1,3 @@
-# syntax=docker/dockerfile:1.17.0
-
 FROM base
 
 ENV DEBIAN_FRONTEND=noninteractive

tools/git/Dockerfile

@@ -4,7 +4,7 @@ set -eux
 
 export $(cat $BUILDER_ENV_FILE)
 
-curl -fsSL -o git.tar.xz https://www.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.xz
+curl -fsSL -o git.tar.xz https://www.kernel.org/pub/software/scm/git/git-$TOOL_VERSION.tar.xz
 
 tar -xJf git.tar.xz
 rm git.tar.xz

tools/git/Aptfile tools/git/builder/Aptfiletools/git/Aptfile renamed to tools/git/builder/Aptfile

@@ -4,7 +4,7 @@ set -eux
 
 export $(cat $BUILDER_ENV_FILE)
 
-cd git-$GIT_VERSION
+cd git-$TOOL_VERSION
 
 make configure
 ./configure --prefix=$TOOL_DIR --with-openssl --with-curl

tools/git/builder/bin/1-download.sh

@@ -4,6 +4,6 @@ set -ex
 
 export $(cat $BUILDER_ENV_FILE)
 
-curl -fsSL -o node.tar.xz https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$NODE_ARCH.tar.xz 
+curl -fsSL -o node.tar.xz https://nodejs.org/dist/v$TOOL_VERSION/node-v$TOOL_VERSION-$NODE_ARCH.tar.xz 
 tar -xJf node.tar.xz
 rm node.tar.xz

tools/git/builder/bin/2-install.sh

@@ -4,7 +4,7 @@ set -eux
 
 export $(cat $BUILDER_ENV_FILE)
 
-mv node-v$NODE_VERSION-$NODE_ARCH/bin $TOOL_DIR/
-mv node-v$NODE_VERSION-$NODE_ARCH/include $TOOL_DIR/
-mv node-v$NODE_VERSION-$NODE_ARCH/lib $TOOL_DIR/
-mv node-v$NODE_VERSION-$NODE_ARCH/share $TOOL_DIR/
+mv node-v$TOOL_VERSION-$NODE_ARCH/bin $TOOL_DIR/
+mv node-v$TOOL_VERSION-$NODE_ARCH/include $TOOL_DIR/
+mv node-v$TOOL_VERSION-$NODE_ARCH/lib $TOOL_DIR/
+mv node-v$TOOL_VERSION-$NODE_ARCH/share $TOOL_DIR/