Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
aports
aports
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 649
    • Issues 649
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 196
    • Merge Requests 196
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • alpine
  • aportsaports
  • Merge Requests
  • !6713

Closed
Opened Apr 12, 2020 by Antoine Fontaine@afontainContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.alpinelinux.org/afontain/aports.git" "lxc4-anbox"
git checkout -b "afontain/aports-lxc4-anbox" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "afontain/aports-lxc4-anbox"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

main/lxc: backport file descriptor patch

  • Overview 1
  • Commits 1
  • Pipelines 1
  • Changes 1

without it, you'll find that, inside a container, /proc/1/fd/14 points to /proc/1234/status. This breaks some software, like Anbox (https://github.com/anbox/anbox/issues/1397).

This MR backports the patch and repairs Anbox.

Screenshot_2020-04-12_19_58_33+02_00

Edited Apr 12, 2020 by Antoine Fontaine
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
Labels
aports:improve type:bug
Assign labels
  • View project labels
Reference: alpine/aports!6713
Source branch: lxc4-anbox