Skip to content

Commit 31c54cd

Browse files
simusimu
authored
Merge pull request #171 from projectsyn/syntroduction-2023-refresh
Update Project Syn introduction slides for 2023
2 parents 380a9a8 + 6925e4b commit 31c54cd

File tree

13 files changed

+901
-109
lines changed

13 files changed

+901
-109
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ indent_style = tab
2828
[*.html]
2929
trim_trailing_whitespace = false
3030
insert_final_newline = false
31+
32+
[*.svg]
33+
insert_final_newline = unset

‎slides/syntroduction/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.vscode
22
theme
33
node_modules
4+
Caddyfile
5+
Guardfile

‎slides/syntroduction/Caddyfile‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎slides/syntroduction/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# ---------- STEP 1 ----------
22
# Build the HTML slides
3-
FROM vshn/asciidoctor-slides:1.7 as htmlmaker
3+
FROM vshn/asciidoctor-slides:1.16.0 as htmlmaker
44

55
COPY assets /build/assets
66
COPY slides.adoc /build/slides.adoc
77
RUN generate-vshn-slides --filename slides.adoc
88

99
# ---------- STEP 2 ----------
1010
# Build the presentation in PDF format
11-
FROM astefanutti/decktape:2.11.0 as pdfmaker
11+
FROM astefanutti/decktape:3.4.0 as pdfmaker
1212

1313
COPY --from=htmlmaker /build/slides.html /slides/slides.html
1414
COPY --from=htmlmaker /build/assets /slides/assets
@@ -20,11 +20,12 @@ COPY --from=htmlmaker /presentation/node_modules/lato-font /slides/node_modules/
2020
COPY --from=htmlmaker /presentation/node_modules/typeface-ubuntu /slides/node_modules/typeface-ubuntu
2121
COPY --from=htmlmaker /presentation/node_modules/typeface-ubuntu-mono /slides/node_modules/typeface-ubuntu-mono
2222
COPY --from=htmlmaker /presentation/node_modules/@fortawesome /slides/node_modules/@fortawesome
23-
RUN node /decktape/decktape.js --chrome-path chromium-browser --chrome-arg=--no-sandbox --size '2560x1440' --pause 2000 --chrome-arg=--allow-file-access-from-files /slides/slides.html /slides/slides.pdf
23+
COPY --from=htmlmaker /presentation/node_modules/@fontsource /slides/node_modules/@fontsource
24+
RUN node /decktape/decktape.js --chrome-path chromium-browser --chrome-arg=--no-sandbox --size '1920x1080' --pause 2000 --chrome-arg=--allow-file-access-from-files /slides/slides.html /slides/slides.pdf
2425

2526
# ---------- STEP 3 ----------
2627
# Docker image only containing nginx and the freshly built presentation files
27-
FROM vshn/nginx:1.0
28+
FROM vshn/nginx:1.21.1
2829

2930
# Finally, copy the contents of the presentation to be served
3031
COPY --from=htmlmaker /build/slides.html /usr/share/nginx/html/index.html
@@ -37,4 +38,5 @@ COPY --from=htmlmaker /presentation/node_modules/lato-font /usr/share/nginx/html
3738
COPY --from=htmlmaker /presentation/node_modules/typeface-ubuntu /usr/share/nginx/html/node_modules/typeface-ubuntu
3839
COPY --from=htmlmaker /presentation/node_modules/typeface-ubuntu-mono /usr/share/nginx/html/node_modules/typeface-ubuntu-mono
3940
COPY --from=htmlmaker /presentation/node_modules/@fortawesome /usr/share/nginx/html/node_modules/@fortawesome
41+
COPY --from=htmlmaker /presentation/node_modules/@fontsource /usr/share/nginx/html/node_modules/@fontsource
4042
COPY --from=pdfmaker /slides/slides.pdf /usr/share/nginx/html/slides.pdf

‎slides/syntroduction/Guardfile‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎slides/syntroduction/Makefile‎

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,56 @@
1+
SHELL := /bin/bash
2+
13
.PHONY: all
24
all: slides.html slides.pdf
35

4-
.PHONY: serve
5-
serve: slides.html
6-
caddy run
6+
.PHONY: preview
7+
preview: slides.adoc
8+
docker run --user "$$(id -u)" --rm --publish 35729:35729 --publish 2020:2020 --volume "$${PWD}":/build vshn/slides-preview:1.16.0
79

810
slides.html: slides.adoc
9-
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/build vshn/asciidoctor-slides:1.7 --filename slides.adoc
11+
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/build vshn/asciidoctor-slides:1.16.0 --filename slides.adoc
1012

1113
slides.pdf: slides.html
12-
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/slides astefanutti/decktape:2.11.0 --size '2560x1440' --pause 2000 --chrome-arg=--allow-file-access-from-files slides.html slides.pdf
14+
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/slides astefanutti/decktape:3.4.0 --size '1920x1080' --chrome-arg=--allow-file-access-from-files slides.html slides.pdf
15+
16+
slides-with-transitions.pdf: slides.html
17+
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/slides astefanutti/decktape:3.4.0 --size '1920x1080' --chrome-arg=--allow-file-access-from-files slides.html?fragments=true slides-with-transitions.pdf
18+
19+
slides-with-notes.html: slides.adoc
20+
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/build vshn/asciidoctor-slides:1.16.0 --filename slides.adoc --show-notes --attribute slides-pdf-export --output slides-with-notes.html
21+
22+
slides-with-notes.pdf: slides-with-notes.html
23+
docker run --rm --tty --user "$$(id -u)" --volume "$${PWD}":/slides astefanutti/decktape:3.4.0 --size '1920x1080' --chrome-arg=--allow-file-access-from-files slides-with-notes.html slides-with-notes.pdf
24+
25+
# This target lists the images not used in the final presentation,
26+
# and which could be removed.
27+
.PHONY: unused_images
28+
unused_images: slides.html
29+
@for file in assets/images/* ; do \
30+
if ! grep -U $${file##*/} slides.html > /dev/null; then \
31+
echo $$file; \
32+
fi; \
33+
done;
34+
35+
speaker-notes.html: slides.adoc
36+
@docker run --rm --volume ${PWD}:/convert vshn/slides-notes-exporter:1.0 html /convert/slides.adoc
37+
38+
speaker-notes.pdf: slides.adoc
39+
@docker run --rm --volume ${PWD}:/convert vshn/slides-notes-exporter:1.0 pdf /convert/slides.adoc
40+
41+
.PHONY: speaker-notes
42+
speaker-notes: slides.adoc
43+
@docker run --rm --volume ${PWD}:/convert vshn/slides-notes-exporter:1.0 /convert/slides.adoc
44+
45+
.PHONY: docker
46+
docker: slides.pdf
47+
docker build -t syntroductionv2:1.0 .
1348

1449
.PHONY: clean
1550
clean:
16-
find . -maxdepth 1 -name '*.adoc' | sed 's/.adoc$$/.html/' | xargs rm -f
17-
find . -maxdepth 1 -name '*.adoc' | sed 's/.adoc$$/.pdf/' | xargs rm -f
18-
find . -maxdepth 1 -name 'theme' | xargs rm -rf
51+
find . -maxdepth 1 -name 'Caddyfile' | xargs rm -f; \
52+
find . -maxdepth 1 -name 'Guardfile' | xargs rm -f; \
53+
find . -maxdepth 1 -name '*.html' | xargs rm -f; \
54+
find . -maxdepth 1 -name '*.pdf' | xargs rm -f; \
55+
find . -maxdepth 1 -name 'theme' | xargs rm -rf; \
1956
find . -maxdepth 1 -name 'node_modules' | xargs rm -rf

‎slides/syntroduction/assets/images/diag-b12458677ba063e39ab979047f5a84b0abafd539.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎slides/syntroduction/assets/images/project-syn.png‎

-91.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)