From fb012b6de8f6db159f7de4b062ce43fed54572ef Mon Sep 17 00:00:00 2001
From: shokkunrf <19404989+shokkunrf@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:04:31 +0000
Subject: [PATCH] Use official git feature instead of local build for
 base-alpine

---
 .../.devcontainer/devcontainer-lock.json      |  7 +++-
 .../.devcontainer/devcontainer.json           |  5 ++-
 .../git/devcontainer-feature.json             |  4 --
 .../local-features/git/install.sh             | 42 -------------------
 src/base-alpine/manifest.json                 |  2 +-
 5 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 src/base-alpine/.devcontainer/local-features/git/devcontainer-feature.json
 delete mode 100644 src/base-alpine/.devcontainer/local-features/git/install.sh

diff --git a/src/base-alpine/.devcontainer/devcontainer-lock.json b/src/base-alpine/.devcontainer/devcontainer-lock.json
index 2644c249a6..2b44aecdb4 100644
--- a/src/base-alpine/.devcontainer/devcontainer-lock.json
+++ b/src/base-alpine/.devcontainer/devcontainer-lock.json
@@ -4,6 +4,11 @@
       "version": "2.5.6",
       "resolved": "ghcr.io/devcontainers/features/common-utils@sha256:9ddad2e4f71f172cc0bf28461e70948218f70f8ad6cd936b5c8dbe0a8acf6b45",
       "integrity": "sha256:9ddad2e4f71f172cc0bf28461e70948218f70f8ad6cd936b5c8dbe0a8acf6b45"
+    },
+    "ghcr.io/devcontainers/features/git:1": {
+      "version": "1.3.5",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
+      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/base-alpine/.devcontainer/devcontainer.json b/src/base-alpine/.devcontainer/devcontainer.json
index 024879fbf2..4fe41ab840 100644
--- a/src/base-alpine/.devcontainer/devcontainer.json
+++ b/src/base-alpine/.devcontainer/devcontainer.json
@@ -12,7 +12,10 @@
 			"userGid": "1000",
 			"upgradePackages": "true"
 		},
-		"./local-features/git": {}
+		"ghcr.io/devcontainers/features/git:1": {
+			"version": "latest",
+			"ppa": "false"
+		}
 	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/src/base-alpine/.devcontainer/local-features/git/devcontainer-feature.json b/src/base-alpine/.devcontainer/local-features/git/devcontainer-feature.json
deleted file mode 100644
index b870b7aa05..0000000000
--- a/src/base-alpine/.devcontainer/local-features/git/devcontainer-feature.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"id": "git",
-	"name": "Git from source"
-}
diff --git a/src/base-alpine/.devcontainer/local-features/git/install.sh b/src/base-alpine/.devcontainer/local-features/git/install.sh
deleted file mode 100644
index 91034c42dc..0000000000
--- a/src/base-alpine/.devcontainer/local-features/git/install.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/ash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-set -e
-
-apk update
-apk add --no-cache \
-    --upgrade \
-    curl \
-    grep \
-    make \
-    zlib-dev \
-    --no-cache \
-    openssl-dev \
-    curl-dev \
-    expat-dev \
-    asciidoc \
-    xmlto \
-    perl-error \
-    perl-dev \
-    tcl \
-    tk \
-    gcc \
-    g++ \
-    python3-dev \
-    pcre2-dev
-
-GIT_VERSION_LIST="$(curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/git/git/tags" | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"' | sort -rV )"
-GIT_VERSION="$(echo "${GIT_VERSION_LIST}" | head -n 1)"
-
-echo "Installing git v${GIT_VERSION}"
-curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
-
-cd /tmp/git-${GIT_VERSION}
-
-make -s prefix=/usr/local sysconfdir=/etc all NO_REGEX=YesPlease NO_GETTEXT=YesPlease \
-    && make -s prefix=/usr/local sysconfdir=/etc NO_REGEX=YesPlease NO_GETTEXT=YesPlease install 2>&1
-
-rm -rf /tmp/git-${GIT_VERSION}
diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
index 9b14ad1476..be69b3860f 100644
--- a/src/base-alpine/manifest.json
+++ b/src/base-alpine/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.1",
+	"version": "3.0.2",
 	"variants": [
 		"latest",
 		"3.23",