Skip to content

(Vagrant CI) Enable git commands due to git CVE fix#6915

Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom
estesp:cirrus-git-fix
May 9, 2022
Merged

(Vagrant CI) Enable git commands due to git CVE fix#6915
AkihiroSuda merged 1 commit intocontainerd:mainfrom
estesp:cirrus-git-fix

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented May 9, 2022

Add /vagrant to "safe directory" global git config so Vagrant runs work
properly again.

Example failure: https://cirrus-ci.com/task/6459485030973440?logs=vagrant_up#L1092
(Building containerd via the Makefile runs git commands that get a fatal: unsafe repository error due to a CVE fix in recent versions of git)

Signed-off-by: Phil Estes [email protected]

Add /vagrant to "safe directory" global git config so Vagrant runs work
properly again.

Signed-off-by: Phil Estes <[email protected]>
@estesp estesp changed the title Enable git commands due to git CVE fix (Vagrant CI) Enable git commands due to git CVE fix May 9, 2022
@estesp
Copy link
Copy Markdown
Member Author

estesp commented May 9, 2022

Looks like it fixes the issue on Cirrus: https://cirrus-ci.com/task/5774086751125504 (install-containerd script worked instead of failing as it has done on every other PR today)

@AkihiroSuda AkihiroSuda merged commit bd2c006 into containerd:main May 9, 2022
@estesp estesp added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.6.x labels May 12, 2022
@estesp estesp deleted the cirrus-git-fix branch May 12, 2022 18:39
@estesp
Copy link
Copy Markdown
Member Author

estesp commented May 12, 2022

Backported to release/1.6 in #6941

@estesp estesp added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch and removed cherry-pick/1.5.x labels May 13, 2022
@estesp
Copy link
Copy Markdown
Member Author

estesp commented May 13, 2022

Cherry-picked from release/1.6 to release/1.5 in #6943

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants