From c28a503b121a9f3e61f0afad0c23870afc51ef3d Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Tue, 28 May 2024 14:56:12 +0000
Subject: [PATCH] Enhancement: Add `git` in `ci` variants

---
 generate/templates/Dockerfile.ps1 | 12 ++++++++++++
 variants/16.04-ci/Dockerfile      |  6 ++++++
 variants/18.04-ci/Dockerfile      |  6 ++++++
 variants/20.04-ci/Dockerfile      |  6 ++++++
 variants/22.04-ci/Dockerfile      |  6 ++++++
 variants/24.04-ci/Dockerfile      |  6 ++++++
 6 files changed, 42 insertions(+)

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index be256ce..15fcb76 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -40,6 +40,18 @@ RUN set -eux; \
     rm -rf /var/lib/apt/lists/*;
 
 
+"@
+        }
+
+        { $_ -in 'git', 'ci' } {
+        @"
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
+
 "@
         }
 
diff --git a/variants/16.04-ci/Dockerfile b/variants/16.04-ci/Dockerfile
index 325bce7..fe56949 100644
--- a/variants/16.04-ci/Dockerfile
+++ b/variants/16.04-ci/Dockerfile
@@ -22,6 +22,12 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
 RUN set -eux; \
     apt-get update; \
     apt-get install --no-install-recommends -y jq; \
diff --git a/variants/18.04-ci/Dockerfile b/variants/18.04-ci/Dockerfile
index 0d74789..00f8118 100644
--- a/variants/18.04-ci/Dockerfile
+++ b/variants/18.04-ci/Dockerfile
@@ -22,6 +22,12 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
 RUN set -eux; \
     apt-get update; \
     apt-get install --no-install-recommends -y jq; \
diff --git a/variants/20.04-ci/Dockerfile b/variants/20.04-ci/Dockerfile
index 4576daa..23f7816 100644
--- a/variants/20.04-ci/Dockerfile
+++ b/variants/20.04-ci/Dockerfile
@@ -22,6 +22,12 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
 RUN set -eux; \
     apt-get update; \
     apt-get install --no-install-recommends -y jq; \
diff --git a/variants/22.04-ci/Dockerfile b/variants/22.04-ci/Dockerfile
index 4cb8afe..2f6ba56 100644
--- a/variants/22.04-ci/Dockerfile
+++ b/variants/22.04-ci/Dockerfile
@@ -22,6 +22,12 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
 RUN set -eux; \
     apt-get update; \
     apt-get install --no-install-recommends -y jq; \
diff --git a/variants/24.04-ci/Dockerfile b/variants/24.04-ci/Dockerfile
index e5a1655..d270141 100644
--- a/variants/24.04-ci/Dockerfile
+++ b/variants/24.04-ci/Dockerfile
@@ -22,6 +22,12 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN set -eux; \
+    apt-get update; \
+    apt-get install --no-install-recommends -y git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
 RUN set -eux; \
     apt-get update; \
     apt-get install --no-install-recommends -y jq; \