fix-redirects.sh: adding forced redirect

Backport slides.zip addition
Merge remote-tracking branch 'origin/jpetazzo-last-slide' into qconuk2019
2026-02-15 01:59:57 +00:00 · 2020-04-07 16:57:11 -05:00 · 2020-01-12 13:48:30 -06:00 · 2019-03-08 00:52:42 -06:00 · 2019-03-06 03:02:09 -06:00 · 2019-03-03 01:43:32 -06:00
10 changed files with 57 additions and 49 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ slides/*.yml.html
 slides/autopilot/state.yaml
 slides/index.html
 slides/past.html
+slides/slides.zip
 node_modules

 ### macOS ###
--- a/slides/Dockerfile
+++ b/slides/Dockerfile
@@ -1,7 +1,4 @@
-FROM alpine
-RUN apk update
-RUN apk add entr
-RUN apk add py-pip
-RUN apk add git
+FROM alpine:3.11
+RUN apk add --no-cache entr py3-pip git zip
 COPY requirements.txt .
-RUN pip install -r requirements.txt
+RUN pip3 install -r requirements.txt
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -0,0 +1 @@
+/ /kube-fullday.yml.html 200!
--- a/slides/build.sh
+++ b/slides/build.sh
@@ -14,6 +14,7 @@ once)
      ./appendcheck.py $YAML.html
    done
  fi
+  zip -qr slides.zip . && echo "Created slides.zip archive."
  ;;

 forever)
--- a/slides/index.py
+++ b/slides/index.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # coding: utf-8
 TEMPLATE="""<html>
 <head>
@@ -106,13 +106,13 @@ TEMPLATE="""<html>
    </table>
  </div>
 </body>
-</html>""".decode("utf-8")
+</html>"""

 import datetime
 import jinja2
 import yaml

-items = yaml.load(open("index.yaml"))
+items = yaml.safe_load(open("index.yaml"))

 # Items with a date correspond to scheduled sessions.
 # Items without a date correspond to self-paced content.
@@ -160,10 +160,10 @@ with open("index.html", "w") as f:
    	past_workshops=past_workshops,
    	self_paced=self_paced,
    	recorded_workshops=recorded_workshops
-    	).encode("utf-8"))
+    	))

 with open("past.html", "w") as f:
 	f.write(template.render(
 		title="Container Training",
 		all_past_workshops=past_workshops
-		).encode("utf-8"))
+		))
--- a/slides/kube-fullday.yml
+++ b/slides/kube-fullday.yml
@@ -1,14 +1,15 @@
 title: |
-  Deploying and Scaling Microservices
-  with Kubernetes
+  Getting Started
+  With Kubernetes and
+  Container Orchestration

 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20190307-london)"
+#chat: "In person!"

 gitrepo: github.com/jpetazzo/container.training

-slides: http://container.training/
+slides: http://qconuk2019.container.training/

 exclude:
 - self-paced
--- a/slides/logistics.md
+++ b/slides/logistics.md
@@ -1,32 +1,16 @@
 ## Intros

- This slide should be customized by the tutorial instructor(s).
-
 - Hello! We are:

-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
-
-   - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
-
- <!-- .dummy[
-
   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)

-   - .emoji[🚁] Alexandre ([@alexbuisine](https://twitter.com/alexbuisine), Enix SAS)
-
   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS)

-   - .emoji[⛵] Jérémy ([@jeremygarrouste](twitter.com/jeremygarrouste), Inpiwee)
+- The workshop will run from 9am to 4pm

-   - .emoji[🎧] Romain ([@rdegez](https://twitter.com/rdegez), Enix SAS)
+- There will be a lunch break at noon

-] -->
-
- The workshop will run from ...
-
- There will be a lunch break at ...
-
-  (And coffee breaks!)
+  (And coffee breaks at 10:30am and 2:30pm)

 - Feel free to interrupt for questions at any time

--- a/slides/markmaker.py
+++ b/slides/markmaker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # transforms a YAML manifest into a HTML workshop file

 import glob
@@ -26,12 +26,19 @@ def anchor(title):
    return "toc-" + title


-def interstitials_generator():
-    images = [url.strip() for url in open("interstitials.txt") if url.strip()]
-    while True:
-        for image in images:
-            yield image
-interstitials = interstitials_generator()
+class Interstitials(object):
+
+    def __init__(self):
+        self.index = 0
+        self.images = [url.strip() for url in open("interstitials.txt") if url.strip()]
+
+    def next(self):
+        index = self.index % len(self.images)
+        index += 1
+        return self.images[index]
+
+
+interstitials = Interstitials()


 def insertslide(markdown, title):
@@ -159,8 +166,6 @@ def gentoc(tree, path=()):
 # Returns: (epxandedmarkdown,[list of titles])
 # The list of titles can be nested.
 def processchapter(chapter, filename):
-    if isinstance(chapter, unicode):
-        return processchapter(chapter.encode("utf-8"), filename)
    if isinstance(chapter, str):
        if "\n" in chapter:
            titles = re.findall("^# (.*)", chapter, re.MULTILINE)
@@ -183,14 +188,14 @@ try:
    if "REPOSITORY_URL" in os.environ:
        repo = os.environ["REPOSITORY_URL"]
    else:
-        repo = subprocess.check_output(["git", "config", "remote.origin.url"])
+        repo = subprocess.check_output(["git", "config", "remote.origin.url"]).decode("ascii")
    repo = repo.strip().replace("git@github.com:", "https://github.com/")
    if "BRANCH" in os.environ:
        branch = os.environ["BRANCH"]
    else:
-        branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+        branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode("ascii")
        branch = branch.strip()
-    base = subprocess.check_output(["git", "rev-parse", "--show-prefix"])
+    base = subprocess.check_output(["git", "rev-parse", "--show-prefix"]).decode("ascii")
    base = base.strip().strip("/")
    urltemplate = ("{repo}/tree/{branch}/{base}/{filename}"
        .format(repo=repo, branch=branch, base=base, filename="{}"))
@@ -198,12 +203,12 @@ except:
    logging.exception("Could not generate repository URL; generating local URLs instead.")
    urltemplate = "file://{pwd}/{filename}".format(pwd=os.environ["PWD"], filename="{}")
 try:
-    commit = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"])
+    commit = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode("ascii")
 except:
    logging.exception("Could not figure out HEAD commit.")
    commit = "??????"
 try:
-    dirtyfiles = subprocess.check_output(["git", "status", "--porcelain"])
+    dirtyfiles = subprocess.check_output(["git", "status", "--porcelain"]).decode("ascii")
 except:
    logging.exception("Could not figure out repository cleanliness.")
    dirtyfiles = "?? git status --porcelain failed"
--- a/slides/runtime.txt
+++ b/slides/runtime.txt
@@ -0,0 +1 @@
+3.7
--- a/slides/shared/thankyou.md
+++ b/slides/shared/thankyou.md
@@ -9,3 +9,20 @@ class: title, in-person
 That's all, folks! <br/> Questions?

 ![end](images/end.jpg)
+
+---
+
+## Final words
+
+- You can find more content on http://container.training/
+
+  (More slides, videos, dates of upcoming workshops and tutorials...)
+
+- If you want me to train your team:
+  [contact me!](https://docs.google.com/forms/d/e/1FAIpQLScm2evHMvRU8C5ZK59l8FGsLY_Kkup9P_GHgjfByUMyMpMmDA/viewform)
+
+  (This workshop is also available as longer training sessions, covering advanced topics)
+
+- The organizers of this conference would like you to rate this workshop!
+
+.footnote[*Thank you!*]
Author	SHA1	Message	Date
Jerome Petazzoni	787ed190b0	fix-redirects.sh: adding forced redirect	2020-04-07 16:57:11 -05:00
Jerome Petazzoni	745ebefc3d	Backport slides.zip addition	2020-01-12 13:48:30 -06:00
Jerome Petazzoni	53907d82b4	Merge remote-tracking branch 'origin/jpetazzo-last-slide' into qconuk2019	2019-03-08 00:52:42 -06:00
Jerome Petazzoni	b8f11b3c72	Merge branch 'master' into qconuk2019	2019-03-06 03:02:09 -06:00
Jerome Petazzoni	ff91c26976	Minor fixes	2019-03-03 01:43:32 -06:00
Jerome Petazzoni	ff40b79775	Merge branch 'master' into qconuk2019	2019-03-03 01:28:24 -06:00
Jerome Petazzoni	1dfdec413a	Assemble deck for QCON London 2019	2019-03-03 01:27:52 -06:00
Jerome Petazzoni	6b9b83a7ae	Add link to my private training intake form	2018-10-31 22:50:41 -05:00