Skip to content

Commit f96f9c3

Browse files
committed
Switch to setting a work directory and just running make
1 parent dca2ac3 commit f96f9c3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

outputs/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ update-outputs: run
3232
cat $$raw | perl -pe 's/\x1b]0;.+?\x07//g' | perl -pe 's/\x1b\[\d+F\x1b\[J//g' | perl -pe 's/\033\[([01];)?\d+m//g' | col -bp | sed '/^==> Waiting for/d' > $$out; \
3333
done
3434

35-
run:
36-
$(DOCKER) run $(DOCKER_RUN_OPTS) --rm -t \
37-
--mount type=bind,source=$(CURDIR),target=/project \
38-
${container} make -f /project/Makefile local
39-
4035
local: local-scripting
4136
local-scripting: local-dev scripting.sh
4237
#local-cache: local-dev cache.sh
@@ -50,9 +45,14 @@ local-basics: basics.sh init_spack.sh defs.sh
5045
local-%: %.sh init_spack.sh defs.sh
5146
$(CURDIR)/$(@:local-%=%).sh
5247

48+
run:
49+
$(DOCKER) run $(DOCKER_RUN_OPTS) --rm -t \
50+
--mount type=bind,source=$(CURDIR),target=/project -w /project \
51+
${container} make local
52+
5353
interactive:
5454
$(DOCKER) run $(DOCKER_RUN_OPTS) --rm -it \
55-
--mount type=bind,source=$(CURDIR),target=/project \
55+
--mount type=bind,source=$(CURDIR),target=/project -w /project \
5656
${container}
5757

5858
$(addprefix clean-,$(sections)):

0 commit comments

Comments
 (0)