fix-redirects.sh: adding forced redirect

Re-add builder chapters
Merge branch 'master' into kube-2019-01
2026-02-15 10:09:56 +00:00 · 2020-04-07 16:49:49 -05:00 · 2019-01-19 03:58:20 -06:00 · 2019-01-19 03:57:47 -06:00 · 2019-01-17 01:36:42 -06:00 · 2019-01-17 00:47:43 -06:00
6 changed files with 29 additions and 28 deletions
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -0,0 +1 @@
+/ /kube-twodays.yml.html 200!
--- a/slides/kube-twodays.yml
+++ b/slides/kube-twodays.yml
@@ -1,14 +1,13 @@
 title: |
-  Deploying and Scaling Microservices
+  Deploying and Scaling Applications
  with Kubernetes

 #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/enix/formation-kubernetes-20190117)"

 gitrepo: github.com/jpetazzo/container.training

-slides: http://container.training/
+slides: http://kube-2019-01.container.training/

 exclude:
 - self-paced
@@ -48,7 +47,7 @@ chapters:
  - k8s/netpol.md
  - k8s/authn-authz.md
 - - k8s/ingress.md
-  - k8s/gitworkflows.md
+  #- k8s/gitworkflows.md
  - k8s/prometheus.md
 - - k8s/volumes.md
  - k8s/build-with-docker.md
--- a/slides/logistics.md
+++ b/slides/logistics.md
@@ -1,30 +1,14 @@
 ## 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)
-
   - .emoji[🎧] Romain ([@rdegez](https://twitter.com/rdegez), Enix SAS)

-] -->
+- The training will run from 9am to 5pm

- The workshop will run from ...
-
- There will be a lunch break at ...
+- There will be a lunch break around noon

  (And coffee breaks!)

--- a/slides/override.css
+++ b/slides/override.css
@@ -0,0 +1,17 @@
+.remark-slide-content:not(.pic) {
+    background-repeat: no-repeat;
+    background-position: 99% 1%;
+    background-size: 8%;
+    background-image: url(https://enix.io/static/img/logos/logo-domain-cropped.png);
+}
+
+div.extra-details:not(.pic) {
+  background-image: url("images/extra-details.png"), url(https://enix.io/static/img/logos/logo-domain-cropped.png);
+  background-position: 0.5% 1%, 99% 1%;
+  background-size: 4%, 8%;
+}
+
+.remark-slide-content:not(.pic) div.remark-slide-number {
+	top: 16px;
+	right: 112px
+}
--- a/slides/shared/title.md
+++ b/slides/shared/title.md
@@ -11,11 +11,10 @@ class: title, in-person
@@TITLE@@<br/></br>

 .footnote[
-**Be kind to the WiFi!**<br/>
-<!-- *Use the 5G network.* -->
-*Don't use your hotspot.*<br/>
-*Don't stream videos or download big files during the workshop[.](https://www.youtube.com/watch?v=h16zyxiwDLY)*<br/>
-*Thank you!*
+<!--
+**WiFi: ENIX**</br>
+**Password: AIRBUS2019**<br/>
+-->

 **Slides: @@SLIDES@@**
 ]
--- a/slides/workshop.html
+++ b/slides/workshop.html
@@ -4,6 +4,7 @@
    <title>@@TITLE@@</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
    <link rel="stylesheet" href="workshop.css">
+    <link rel="stylesheet" href="override.css">
  </head>
  <body>
    <!--
Author	SHA1	Message	Date
Jerome Petazzoni	99b8886c3e	fix-redirects.sh: adding forced redirect	2020-04-07 16:49:49 -05:00
Jerome Petazzoni	13164971ca	Re-add builder chapters	2019-01-19 03:58:20 -06:00
Jerome Petazzoni	c55ce66751	Merge branch 'master' into kube-2019-01	2019-01-19 03:57:47 -06:00
Jerome Petazzoni	e1ccad3ee2	Update WiFi information	2019-01-17 01:36:42 -06:00
Jerome Petazzoni	83535c3f69	Update gitter link; opt out of builder demos	2019-01-17 00:47:43 -06:00
Jerome Petazzoni	9ece59e821	Merge branch 'master' into kube-2019-01	2019-01-14 12:01:47 -06:00
Jerome Petazzoni	cd7a5520fb	Add WiFi information	2019-01-14 02:13:20 -06:00
Jerome Petazzoni	c1757160d7	Merge branch 'master' into kube-2019-01	2019-01-13 15:15:08 -06:00
Jerome Petazzoni	4f8ffcdd97	Merge branch 'master' into kube-2019-01	2019-01-13 15:13:56 -06:00
Jerome Petazzoni	a66b295d06	Use the 2-day deck	2019-01-13 15:08:01 -06:00
Jerome Petazzoni	ae04e02519	Merge branch 'enixlogo' into kube-2019-01	2019-01-13 15:03:29 -06:00
Jerome Petazzoni	7b03961182	Customization	2019-01-13 15:02:20 -06:00
Jerome Petazzoni	f01bc2a7a9	Fix overlapsing slide number and pics	2018-09-29 18:54:00 -05:00
Jerome Petazzoni	3eaa844c55	Add ENIX logo Warning: do not merge this branch to your content, otherwise you will get the ENIX logo in the top right of all your decks	2018-09-08 07:49:38 -05:00