Skip to content

chore: upgrade to git v2.45.1 to fix alpine 3.20 builds #13411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 30, 2024
Merged

chore: upgrade to git v2.45.1 to fix alpine 3.20 builds #13411

merged 1 commit into from
May 30, 2024

Conversation

dannykopping
Copy link
Contributor

@dannykopping dannykopping commented May 30, 2024 •
edited
Loading

Possibly fixes #13407

Edit for clarity: the build works locally on my machine™️ but there may be other issues lurking, hence "probably".

@dannykopping
Upgrade to git v2.45.1 to fix alpine 3.20 builds
6f1e27d 
Possibly fixes coder#13407

Signed-off-by: Danny Kopping <danny@coder.com>
@dannykopping dannykopping mentioned this pull request May 30, 2024
Closed
@dannykopping dannykopping changed the title Upgrade to git v2.45.1 to fix alpine 3.20 builds chore: upgrade to git v2.45.1 to fix alpine 3.20 builds May 30, 2024
@matifali
Copy link
Member

Please rebase once #13409 is merged so that it can be tested :)

@dannykopping dannykopping mentioned this pull request May 30, 2024
Merged
@dannykopping
Copy link
Contributor Author

Please rebase once #13409 is merged so that it can be tested :)

When is that likely to get merged?

@deansheather
Copy link
Member

Have you tried this build locally first?

@dannykopping
Copy link
Contributor Author

Have you tried this build locally first?

Yup, it works.

matifali
matifali approved these changes May 30, 2024
View reviewed changes
Copy link
Member

@matifali matifali left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@johnstcn
Copy link
Member

Is there a reason we pin the git version at all?

@dannykopping dannykopping marked this pull request as ready for review May 30, 2024 08:35
@dannykopping dannykopping enabled auto-merge (squash) May 30, 2024 08:35
@johnstcn johnstcn mentioned this pull request May 30, 2024
Closed
@dannykopping dannykopping merged commit a1671a6 into coder:main May 30, 2024
31 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators May 30, 2024
@dannykopping
Copy link
Contributor Author

Whoops @matifali I had this on auto-merge but I see you just merged #13409, and you said you wanted to test with that too.

@dannykopping dannykopping deleted the dk/fix-alpine-build branch May 30, 2024 08:37
@dannykopping
Copy link
Contributor Author

dannykopping commented May 30, 2024 •
edited
Loading

Is there a reason we pin the git version at all?

@johnstcn it was first done 2 weeks ago by @coadler: #13299
Seems like there was an RCE vuln.

@dannykopping
Copy link
Contributor Author

dannykopping commented May 30, 2024 •
edited
Loading

Looks like 3.20 includes the version I hardcoded, so I think it's probably safe to remove the pinning.

I'll create a follow-up PR.
#13414

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

@johnstcn johnstcn johnstcn approved these changes

@matifali matifali matifali approved these changes

@coadler coadler Awaiting requested review from coadler

@deansheather deansheather Awaiting requested review from deansheather

Assignees

@dannykopping dannykopping

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

docker-base build is failing since bumping alpine to 3.20
4 participants
@dannykopping @matifali @deansheather @johnstcn