Docker: Fix git perms issue during copter build

[henrywarhurst]

I encountered the follow issue during the docker build:

ardupilot@35af3dd2b3ee:/ardupilot$ ./waf copter
Waf: Entering directory `/ardupilot/build/sitl'
Embedding file locations.txt:Tools/autotest/locations.txt
Embedding file models/Callisto.json:Tools/autotest/models/Callisto.json
Embedding file models/freestyle.json:Tools/autotest/models/freestyle.json
Embedding file models/plane-3d.parm:Tools/autotest/models/plane-3d.parm
Embedding file models/plane.parm:Tools/autotest/models/plane.parm
Embedding file models/xplane_heli.json:Tools/autotest/models/xplane_heli.json
Embedding file models/xplane_plane.json:Tools/autotest/models/xplane_plane.json
Command ['/usr/bin/git', 'rev-parse', '--short=8', 'HEAD'] returned 128

My system:

• OSX 15.0.1 (24A348)
• Docker Desktop 4.33.0 (160616)
• Fresh clone of ardupilot 145cc4b

[henrywarhurst]

@rmackay9 maybe could you have a look at this one

[khancyr]

@henrywarhurst shouldn't you do this on host ?

[henrywarhurst]

@khancyr maybe I'm not sure what you mean, but the problem seems localized to inside the container. Open to other ideas, but git doesn't seem broken on the host side, all the usual git commands work on host side without issue, and not in the container. Lmk though! Maybe I'm misunderstanding your point

[henrywarhurst]

When I run git status inside the container, this happens (before my change):

ardupilot@35af3dd2b3ee:/ardupilot$ git status
fatal: detected dubious ownership in repository at '/ardupilot'
To add an exception for this directory, call:

	git config --global --add safe.directory /ardupilot

Outside the container on the host, git status has no issues

[khancyr]

ok, could you just move it before L36 where we call install-prereqs-ubuntu.sh ? there is a git call in it

and it should be good.
I assume that is some macos permission thingsbut it shouldn't bother on linux side

[henrywarhurst]

done @khancyr. Yeah probably an OSX specific issue

EDIT:
Actually I can't put it before L36 because git isn't installed yet then. Put it just after and added a comment

[henrywarhurst]

@khancyr would you mind having another look and approving if this looks good?

[henrywarhurst]

friendly ping @khancyr

[khancyr]

Looks good for the code.

For the commit style : you need to rebase to get ride of the merge commit.
And start the commit msg with "Docker:" so we can track it is docker change ! And it should be good to merge

[henrywarhurst]

Thanks @khancyr. I cleaned up the commit history

[khancyr]

LGTM

[henrywarhurst]

thanks @khancyr. Any idea why this isn't merging on its own?

[khancyr]

@henrywarhurst we don't have automerge so a maintainer need to manual action to merge it

[peterbarker]

Merged, thanks!