Docker from current git

[maho]

it's nice to build docker with current, bleeding edge or even uncommited version of buildozer, instead of using only stable, pypi pushed buildozer version.

In such case, --build-arg git=true should be used.

[KeyWeeUsr]

Are you "Lukasz Mach" or why is it that the commits have different author for both #775 and #773? Also, there already is a PR for the first commit(#773), please remove that part and leave only 7158ceb commit.

[maho]

Yes, I'm Lukasz Mach and I don't know why it took my Name/Surname instead of nick. Probably infected with my other settings.

Re commit - how can I remove it? This commit is based on #773, I believe that once #773 is merged to master, then this commit will disappear from list of commits and from diff.

[KeyWeeUsr]

Ok, just wanted the confirmation. About that commit, you can do

git add .
git stash
git reset HEAD~2
git add *Dockerfile* *setup.py*
git commit -m "<some msg>"
git push -f
git stash pop

to save all your unsaved changes to stash, remove the two commits (but leave the changes available), add only the Docker related changes, create a clean commit, force push to this branch (you have a different branch for PR #773) and retrieve back the saved changes from stash.

Also, don't add unnecessary spaces on this line 7158ceb#diff-2eeaed663bd0d25b7e608891384b7298R47.

Otherwise the (docker related) changes are fine and I'd merge them. I'm not sure about NDK changes, that's why I want to remove the previous commit :)

[maho]

ok, so I did like you said. It's not exactly clear what do those commands do, but apparently they work.

[KeyWeeUsr]

Seems good to me, also it's good to have most likely an import error fixed with the missing sh requirement included.

I wonder if the code that uses sh was only recently included or whether it just silently failed because p4a included that dependency too.

[KeyWeeUsr]

Could you please remove this empty change?

[AndreMiras]

Yes I also got bugged by it, but I tried to not say anything because I'm always the one nit picking 😛
So sorry if I saw your comment before I would not have merged 😕

[AndreMiras]

Looking good to me, thank you

[AndreMiras]

I wonder if the code that uses sh was only recently included or whether it just silently failed because p4a included that dependency too.

Yes @KeyWeeUsr the sh "regression" was introduced in #740

ok, so I did like you said. It's not exactly clear what do those commands do, but apparently they work.

@mahomahomaho yes git squashing and rebasing looks awkward at first, but it's actually a pretty awesome thing to know and use