@@ -14,7 +14,7 @@ DOCKER_RUN_OPTS :=
1414
1515
1616# Name of the container we'll generate the tutorial outputs with
17- container := ghcr.io/spack/tutorial:latest@sha256:417900cce4592159456050a91d844fc9e81fcb01125a55555092fa450ce59a67
17+ container := ghcr.io/spack/tutorial:latest
1818
1919# Sections to build
2020sections := environments
@@ -32,34 +32,25 @@ 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 : run-scripting
36-
37- run-scripting : run-cache scripting.sh
38- run-cache : run-dev cache.sh
39- run-dev : run-packaging dev.sh
40- run-packaging : run-stacks packaging.sh
41- run-stacks : run-environments stacks.sh
42- run-environments : run-basics environments.sh
43- run-basics : basics.sh init_spack.sh defs.sh
35+ run :
36+ $(DOCKER ) run $(DOCKER_RUN_OPTS ) --rm -t \
37+ --mount type=bind,source=$(CURDIR ) ,target=/project \
38+ ${container} \
39+ make -f /project/Makefile local
4440
4541local : local-scripting
46- local-scripting : local-cache scripting.sh
47- local-cache : local-dev cache.sh
42+ local-scripting : local-dev scripting.sh
43+ # local-cache: local-dev cache.sh
4844local-dev : local-packaging dev.sh
4945local-packaging : local-stacks packaging.sh
5046local-stacks : local-environments stacks.sh
47+ # local-config: local-environments config.sh # coming soon^TM
5148local-environments : local-basics environments.sh
5249local-basics : basics.sh init_spack.sh defs.sh
5350
5451local-% : % .sh init_spack.sh defs.sh
5552 $(CURDIR ) /$(@:local-%=% ) .sh
5653
57- run-% : % .sh init_spack.sh defs.sh
58- $(DOCKER ) run $(DOCKER_RUN_OPTS ) --rm -t \
59- --mount type=bind,source=$(CURDIR ) ,target=/project \
60- ${container} \
61- /project/$(@:run-%=% ) .sh && touch $@
62-
6354interactive :
6455 $(DOCKER ) run $(DOCKER_RUN_OPTS ) --rm -it \
6556 --mount type=bind,source=$(CURDIR ) ,target=/project \
0 commit comments