Skip to content
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.

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

Fix incorrect CurrentUser check for docker rootless #24435

Merged
merged 1 commit into from Apr 30, 2023

Conversation

wxiaoguang
Copy link
Contributor

Many users report that 1.19 has a regression bug: the rootless image can't start if the UID is not 1000.

#23632 (comment)

https://discourse.gitea.io/t/gitea-doesnt-start-after-update-to-1-19/6920/9

The problem is that the IsRunUserMatchCurrentUser logic is fragile, the "SSH" config is not ready when it executes.

This PR is just a quick fix for 1.19. For 1.20, we need a clear and stable solution.

@GiteaBot GiteaBot added this to the 1.19.3 milestone Apr 30, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 30, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 30, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 30, 2023
@lunny lunny added the type/bug label Apr 30, 2023
@techknowlogick techknowlogick added outdated/backport/v1.19 This PR should be backported to Gitea 1.19 and removed outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 30, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 30, 2023
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 30, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) April 30, 2023 03:29
@techknowlogick techknowlogick merged commit d9d3f52 into go-gitea:release/v1.19 Apr 30, 2023
2 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 30, 2023
@wxiaoguang wxiaoguang deleted the fix-rootless branch April 30, 2023 04:14
Sh4kE added a commit to Sh4kE/k8s-projects that referenced this pull request May 7, 2023
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.19.2-rootless` -> `1.19.3-rootless` |

---

### Release Notes

<details>
<summary>go-gitea/gitea</summary>

### [`v1.19.3`](https://github.com/go-gitea/gitea/blob/HEAD/CHANGELOG.md#&#8203;1193-httpsgithubcomgo-giteagiteareleasestag1193---2023-05-03)

[Compare Source](go-gitea/gitea@v1.19.2...v1.19.3)

-   SECURITY
    -   Use golang 1.20.4 to fix CVE-2023-24539, CVE-2023-24540, and CVE-2023-29400
-   ENHANCEMENTS
    -   Enable whitespace rendering on selection in Monaco ([#&#8203;24444](go-gitea/gitea#24444)) ([#&#8203;24485](go-gitea/gitea#24485))
    -   Improve milestone filter on issues page ([#&#8203;22423](go-gitea/gitea#22423)) ([#&#8203;24440](go-gitea/gitea#24440))
-   BUGFIXES
    -   Fix api error message if fork exists ([#&#8203;24487](go-gitea/gitea#24487)) ([#&#8203;24493](go-gitea/gitea#24493))
    -   Fix user-cards format ([#&#8203;24428](go-gitea/gitea#24428)) ([#&#8203;24431](go-gitea/gitea#24431))
    -   Fix incorrect CurrentUser check for docker rootless ([#&#8203;24435](go-gitea/gitea#24435))
    -   Getting the tag list does not require being signed in ([#&#8203;24413](go-gitea/gitea#24413)) ([#&#8203;24416](go-gitea/gitea#24416))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS42Ni4zIiwidXBkYXRlZEluVmVyIjoiMzUuNjYuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: Michael Wittig <michael.wittig@posteo.de>
Reviewed-on: https://gitea.sh4ke.rocks/sh4ke/k8s-projects/pulls/178
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants