Skip to content

Commit 4dcbc89

Browse files
authored
Update Makefile to use Docker for pandoc commands
1 parent ef11830 commit 4dcbc89

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
all: output/lab-handout.html output/lab-material.zip output/MN.html
22

3+
topo: topology.py
4+
mn --custom topology.py --topo LabTopology --controller none --mac --arp --switch lxbr --link tc
5+
6+
clean:
7+
mn -c
8+
39
output/lab-handout.html: .resources/metadata.md README.md .resources/pandoc.css
410
mkdir -p output
5-
cat .resources/metadata.md README.md | pandoc -s -f markdown+task_lists -t html5 --css .resources/pandoc.css --lua-filter=.resources/enable-checkbox.lua --embed-resources -o output/lab-handout.html
11+
docker run -ti --rm -v "`pwd`":/workspace/ scc-registry.lancs.ac.uk/teaching/pandoc_base:latest sh -c "cd /workspace; cat .resources/metadata.md README.md | pandoc -s -f markdown+task_lists -t html5 --css .resources/pandoc.css --lua-filter=.resources/enable-checkbox.lua --embed-resources -o output/lab-handout.html"
612

713
output/MN.html: .resources/metadata.md MN.md .resources/pandoc.css
814
mkdir -p output
9-
cat .resources/metadata.md MN.md | pandoc -s -f markdown+task_lists -t html5 --css .resources/pandoc.css --lua-filter=.resources/enable-checkbox.lua --embed-resources -o output/MN.html
15+
docker run -ti --rm -v "`pwd`":/workspace/ scc-registry.lancs.ac.uk/teaching/pandoc_base:latest sh -c "cd /workspace; cat .resources/metadata.md MN.md | pandoc -s -f markdown+task_lists -t html5 --css .resources/pandoc.css --lua-filter=.resources/enable-checkbox.lua --embed-resources -o output/MN.html"
1016

1117
output/lab-material.zip: topology.py server.py solution/Makefile .devcontainer.json
1218
mkdir -p output
1319
zip -j output/lab-material.zip topology.py server.py solution/Makefile .devcontainer.json
1420

1521
clean:
1622
rm -f output/*.html
17-
rmdir -p output 2>/dev/null || true
23+
rmdir -p output 2>/dev/null || true

0 commit comments

Comments
 (0)