Skip to content

Commit 77df542

Browse files
Ubuntu & universat: Install git (patched) form opt feeds
1 parent 3b6c321 commit 77df542

File tree

5 files changed

+1
-15
lines changed

5 files changed

+1
-15
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
"userUid": "1000",
1111
"userGid": "1000",
1212
"upgradePackages": "true"
13-
},
14-
"ghcr.io/devcontainers/features/git:1": {
15-
"version": "latest",
16-
"ppa": "false"
1713
}
1814
},
1915
// Use 'forwardPorts' to make a list of ports inside the container available locally.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-
1212
check "git" git --version
1313
check "git-location" sh -c "which git | grep /usr/local/bin/git"
1414

15-
git_version=$(git --version)
16-
check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
17-
1815
check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
1916
check "gitconfig-file-location" sh -c "ls /etc/gitconfig"
2017
check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcontainers'"

src/universal/.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN LANG="C.UTF-8" \
1616
&& apt-get update \
1717
&& apt-get upgrade -y \
1818
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
19+
git \
1920
make \
2021
unzip \
2122
# The tools in this package are used when installing packages for Python

src/universal/.devcontainer/devcontainer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
6363
"version": "latest"
6464
},
65-
"ghcr.io/devcontainers/features/git:1": {
66-
"version": "latest",
67-
"ppa": "false"
68-
},
6965
"ghcr.io/devcontainers/features/go:1": {
7066
"version": "latest"
7167
},
@@ -75,7 +71,6 @@
7571
},
7672
"overrideFeatureInstallOrder": [
7773
"ghcr.io/devcontainers/features/common-utils",
78-
"ghcr.io/devcontainers/features/git",
7974
"ghcr.io/devcontainers/features/dotnet",
8075
"ghcr.io/devcontainers/features/hugo",
8176
"ghcr.io/devcontainers/features/node",

src/universal/test-project/test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ checkCommon
99
check "git" git --version
1010
check "git-location" sh -c "which git | grep /usr/local/bin/git"
1111

12-
git_version=$(git --version)
13-
check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
14-
1512
check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
1613
check "gitconfig-file-location" sh -c "ls /etc/gitconfig"
1714
check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcontainers'"

0 commit comments

Comments
 (0)