Re: [Buildroot] [PATCH] utils/docker-run: make it work in workdirs/woktrees

["Yann E. MORIN" <yann.morin.1998@free.fr>]

All,

On 2023-05-06 23:46 +0200, Yann E. MORIN spake thusly:
> It is quite customary to use a single repository with multiple workdirs,
> one for each active branch, with either the aging 'git new-workdir' or
> the more recent 'git worktree'.
> 
> However, in a workdir/worktree, most entries in .git/ are only symlinks
> to the actual files in the main repository.
> 
> Currently, utils/docker-run only bind-mounts the current working copy.
> If that is a workdir/worktree, then it is going to be missing the actual
> git data, resulting in errors like:
> 
>     $ ./utils/docker-run make check-package
>     fatal: not a git repository (or any parent up to mount point [....]/buildroot)
>     Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
>     No files to check style
>     make: *** [Makefile:1257: check-package] Error 1
> 
> So, we also bind-mount the actual git directory. If that is a subdir
> of the current working copy, then it is already mounted and thus the
> bind-mount is superfluous but harmless; for simplicity, we mount it
> unconditionally.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  utils/docker-run | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/utils/docker-run b/utils/docker-run
> index 135a1451b6..17c587a484 100755
> --- a/utils/docker-run
> +++ b/utils/docker-run
> @@ -2,6 +2,8 @@
>  set -o errexit -o pipefail
>  DIR=$(dirname "${0}")
>  MAIN_DIR=$(readlink -f "${DIR}/..")
> +# GIT_DIR to support workdirs/worktrees
> +GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")"
>  # shellcheck disable=SC2016
>  IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \
>          sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g')
> @@ -11,6 +13,7 @@ declare -a docker_opts=(
>      --rm
>      --user "$(id -u):$(id -g)"
>      --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}"
> +    --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}"
>      --workdir "${MAIN_DIR}"
>  )
>  if tty -s; then
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot