Skip to content

docker: remove --tree-branch argument #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bastien-curutchet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docker: remove --tree-branch argument #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo >&2 Creating CoW tree...
if ! cp -a --reflink=always $NIPA_TREE ./nipa-run/tree 2>/dev/null; then
echo >&2 Falling back to git clone and hardlinks...
rm -rf ./nipa-run/tree
git clone -b nipa-local $NIPA_TREE ./nipa-run/tree
git clone $NIPA_TREE ./nipa-run/tree
fi
# nipa doesn't work if HEAD is pointing to nipa-local, so generate a
# guaranteed random branch name as HEAD. This always happens on
Expand Down Expand Up @@ -48,4 +48,4 @@ docker run $DOCKER_FLAGS --rm --user=nipa \
-v $PWD/ccache:/home/nipa/.ccache \
-v $PWD/ccache:/root/.ccache \
--name nipa-local nipa-local \
/nipa/ingest_mdir.py --mdir /nipa-patches --tree /nipa-run/tree --tree-name $NIPA_TREE_NAME --tree-branch nipa-local
/nipa/ingest_mdir.py --mdir /nipa-patches --tree /nipa-run/tree --tree-name $NIPA_TREE_NAME