Ubuntu & universal: Install git (patched) form OSS feeds (devcontainers#334)

* Ubuntu & universat: Install git (patched) form opt feeds

* update checks

Author: samruddhikhandale

src/base-ubuntu/.devcontainer/devcontainer.json

@@ -10,10 +10,6 @@
             "userUid": "1000",
             "userGid": "1000",
             "upgradePackages": "true"
-        },
-        "ghcr.io/devcontainers/features/git:1": {
-            "version": "latest",
-            "ppa": "false"
         }
     },
     // Use 'forwardPorts' to make a list of ports inside the container available locally.

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

@@ -10,10 +10,9 @@ check "Oh My Zsh! theme" test -e $HOME/.oh-my-zsh/custom/themes/devcontainers.zs
 check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-theme
 
 check "git" git --version
-check "git-location" sh -c "which git | grep /usr/local/bin/git"
 
 git_version=$(git --version)
-check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
+check-version-ge "git-requirement" "${git_version}" "git version 2.34.1"
 
 check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
 check "gitconfig-file-location" sh -c "ls /etc/gitconfig"

src/universal/.devcontainer/Dockerfile

@@ -16,6 +16,7 @@ RUN LANG="C.UTF-8" \
     && apt-get update \
     && apt-get upgrade -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        git \
         make \
         unzip \
         # The tools in this package are used when installing packages for Python

src/universal/.devcontainer/devcontainer.json

@@ -62,10 +62,6 @@
         "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
             "version": "latest"
         },
-        "ghcr.io/devcontainers/features/git:1": {
-            "version": "latest",
-            "ppa": "false"
-        },
         "ghcr.io/devcontainers/features/go:1": {
             "version": "latest"
         },
@@ -75,7 +71,6 @@
     },
     "overrideFeatureInstallOrder": [
         "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/devcontainers/features/git",
         "ghcr.io/devcontainers/features/dotnet",
         "ghcr.io/devcontainers/features/hugo",
         "ghcr.io/devcontainers/features/node",

src/universal/test-project/test.sh

@@ -7,10 +7,9 @@ source test-utils.sh codespace
 checkCommon
 
 check "git" git --version
-check "git-location" sh -c "which git | grep /usr/local/bin/git"
 
 git_version=$(git --version)
-check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
+check-version-ge "git-requirement" "${git_version}" "git version 2.25.1"
 
 check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
 check "gitconfig-file-location" sh -c "ls /etc/gitconfig"