01 January 2018
Jenkins-user and user in docker have different UIDs and thus there are problems with permissions on mounted volumes.
Use -u flag to map container UID to host UID. More here.
In the end, this will still not work nicely with a lot of containers. Instead of mounting volumes I thus try to use docker cp to whenever I can.
It allows to copy and and out of containers but automatically set correct UIDs on host and container-side.
Gitlab flow seems like a reasonble workflow. https://about.gitlab.com/2014/09/29/gitlab-flow/
Why Git flow is considered harmful: http://endoflineblog.com/gitflow-considered-harmful
Undoing merged: https://git-scm.com/blog/2010/03/02/undoing-merges.html
When to pull and merge? Linus tells you: https://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html