Merge pull request devcontainers#162 from devcontainers/samruddhikhandale/add-git-feature

Adds git Feature to images

Author: samruddhikhandale

src/anaconda/.devcontainer/devcontainer.json

@@ -6,6 +6,10 @@
 	"features": {
         "ghcr.io/devcontainers/features/node:1": {
             "version": "none"
+        },
+		"ghcr.io/devcontainers/features/git:1": {
+            "version": "latest",
+            "ppa": "false"
         }
     },
 	// Configure tool-specific properties.

src/anaconda/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "0.202.12",
+	"version": "0.202.13",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",

src/anaconda/test-project/test.sh

@@ -16,6 +16,14 @@ check "yapf" yapf --version
 check "pydocstyle" pydocstyle --version
 check "pycodestyle" pycodestyle --version
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm --version"
+check "git" git --version
+
+git_version_satisfied=false
+if (echo a version 2.38.1; git --version) | sort -Vk3 | tail -1 | grep -q git; then
+    git_version_satisfied=true
+fi
+
+check "git version satisfies requirement" echo $git_version_satisfied | grep "true"
 
 # Report result
 reportResults

src/base-alpine/.devcontainer/library-scripts/common-alpine.sh

@@ -95,7 +95,23 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         which \
         ncdu \
         shadow \
-        strace
+        strace \
+        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
 
     # Install man pages - package name varies between 3.12 and earlier versions
     if apk info man > /dev/null 2>&1; then
@@ -104,10 +120,24 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         apk add --no-cache mandoc man-pages
     fi
 
+    # Temporarily install git from source until OSS feeds contains 2.38.1 or greater version.
     # Install git if not already installed (may be more recent than distro version)
-    if ! type git > /dev/null 2>&1; then
-        apk add --no-cache git
-    fi
+    # if ! type git > /dev/null 2>&1; then
+    #     apk add --no-cache git
+    # fi
+
+    # Install latest version of git from source
+    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
+    pushd /tmp/git-${GIT_VERSION}
+    make -s prefix=/usr/local all NO_REGEX=YesPlease NO_GETTEXT=YesPlease \
+        && make -s prefix=/usr/local NO_REGEX=YesPlease NO_GETTEXT=YesPlease install 2>&1
+
+    popd
+    rm -rf /tmp/git-${GIT_VERSION}
 
     PACKAGES_ALREADY_INSTALLED="true"
 fi

src/base-alpine/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "0.204.11",
+	"version": "0.204.12",
 	"variants": [
 		"3.16",
 		"3.15",

src/base-alpine/test-project/test-utils-alpine.sh

@@ -90,8 +90,7 @@ checkExtension() {
 
 checkCommon()
 {
-    PACKAGE_LIST="git \
-        openssh-client \
+    PACKAGE_LIST="openssh-client \
         gnupg \
         procps \
         lsof \

src/base-alpine/test-project/test.sh

@@ -6,5 +6,14 @@ source test-utils-alpine.sh vscode
 # Run common tests
 checkCommon
 
+check "git" git --version
+
+git_version_satisfied=false
+if (echo a version 2.38.1; git --version) | sort -Vk3 | tail -1 | grep -q git; then
+    git_version_satisfied=true
+fi
+
+check "git version satisfies requirement" echo $git_version_satisfied | grep "true"
+
 # Report result
 reportResults

src/base-debian/.devcontainer/devcontainer.json

@@ -10,7 +10,11 @@
 			"uid": "1000",
 			"gid": "1000",
 			"upgradePackages": "true"
-		}
+		},
+		"ghcr.io/devcontainers/features/git:1": {
+            "version": "latest",
+            "ppa": "false"
+        }
 	},
 	// Configure tool-specific properties.
 	"customizations": {

src/base-debian/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "0.202.13",
+	"version": "0.202.14",
 	"variants": [
 		"buster",
 		"bullseye",

src/base-debian/test-project/test.sh

@@ -6,5 +6,14 @@ source test-utils.sh vscode
 # Run common tests
 checkCommon
 
+check "git" git --version
+
+git_version_satisfied=false
+if (echo a version 2.38.1; git --version) | sort -Vk3 | tail -1 | grep -q git; then
+    git_version_satisfied=true
+fi
+
+check "git version satisfies requirement" echo $git_version_satisfied | grep "true"
+
 # Report result
 reportResults