Merge pull request #3 from sudo-bmitch/registry

Registry

README.md

@@ -5,14 +5,33 @@ the desktop, you can press "P" to see presenter notes. PDF's have also been
 included when possible. For the slides with a live terminal, use "W" and "E" to
 pause/play the recording.
 
+## Docker Intro
+
+Covering containers, images, networks, volumes, security, and building images.
+These slides are still under development.
+
+- [Presentation](https://sudo-bmitch.github.io/presentations/docker-intro/presentation.html)
+
+
+## DockerCon 2020 - Docker Registry Mirroring and Caching
+
+How to use registry mirroring and caching to optimize your image registry,
+reducing time to build and deploy, while also saving bandwidth.
+
+- [Presentation](https://sudo-bmitch.github.io/presentations/registry/presentation.html)
+  [[Download pdf](https://sudo-bmitch.github.io/presentations/registry/presentation.pdf)]
+- [Extended presentation](https://sudo-bmitch.github.io/presentations/registry/presentation-extended.html)
+  [[Download pdf](https://sudo-bmitch.github.io/presentations/registry/presentation-extended.pdf)]
+
+
 ## Docker Build
 
 Covering multi-stage, buildkit, buildx, and multi-architecture images from the
 perspective of a Go user.
 
 - [Presentation](https://sudo-bmitch.github.io/presentations/docker-build/presentation.html)
 
-## DC2019 - Tips and Tricks From The Docker Captains
+## DockerCon 2019 - Tips and Tricks From The Docker Captains
 
 - [Original presentation](https://sudo-bmitch.github.io/presentations/dc2019/tips-and-tricks-of-the-captains.html)
   [[Download pdf](https://sudo-bmitch.github.io/presentations/dc2019/tips-and-tricks-of-the-captains.pdf)]
@@ -23,7 +42,7 @@ perspective of a Go user.
 
 - [Presentation](https://sudo-bmitch.github.io/presentations/bsides-nova/presentation.html)
 
-## DC2018 EU - Tips and Tricks From A Docker Captain
+## DockerCon 2018 EU - Tips and Tricks From A Docker Captain
 
 - [Original presentation](https://sudo-bmitch.github.io/presentations/dc2018eu/tips-and-tricks-of-the-captains.html)
   [[Download pdf](https://sudo-bmitch.github.io/presentations/dc2018eu/tips-and-tricks-of-the-captains.pdf)]
@@ -39,7 +58,7 @@ from DockerCon 2018 in San Francisco](https://drive.google.com/file/d/1RBAl2PfTn
 There was also a webinar given based on the above talk. Slides are almost identical to those above:
 - [Webinar presentation](https://sudo-bmitch.github.io/presentations-webinar-20181212/dc2018eu/tips-and-tricks-of-the-captains.html)
 
-## DC2018 - Frequently Asked Queries from StackOverflow
+## DockerCon 2018 - Frequently Asked Queries from StackOverflow
 
 - [Full presentation](https://sudo-bmitch.github.io/presentations/dc2018/faq-stackoverflow.html)
   [[Download pdf](https://sudo-bmitch.github.io/presentations/dc2018/faq-stackoverflow.pdf)]
@@ -50,7 +69,7 @@ There was also a webinar given based on the above talk. Slides are almost identi
 ## Asciinema
 
 - I use the player from: https://github.com/asciinema/asciinema-player
-- The follow commands are used to build a recording:
+- The following commands are used to build a recording:
   ```
   # Install asciinema:
   apt-get install asciinema

convert-pdf.sh

@@ -1,15 +1,27 @@
 #!/bin/sh
 
-htmlfile=${1:-faq-stackoverflow.html}
+if [ "$(dirname "$0")" != "." -o ! -f "./convert-pdf.sh" ]; then
+  echo "This hacky script assumes you are in the presentations directory, please cd there first"
+  exit 1
+fi
+
+if [ $# -lt 1 ]; then
+  echo "Please provide an html file to convert"
+  exit 1
+fi
+htmlfile=${1}
+
 if [ $# -gt 1 ]; then
   pdffile=$2
 else
   pdffile=$(echo $htmlfile | sed 's/.[^.]*$/.pdf/')
 fi
+
 if [ "$htmlfile" = "$pdffile" ]; then
   echo "PDF file cannot be the same as the input file"
   exit 1
 fi
+
 if [ -f "$pdffile" ]; then
   echo -n "Overwrite $pdffile [y/n]? "
   read response
@@ -19,5 +31,19 @@ if [ -f "$pdffile" ]; then
   esac
 fi
 
-docker run --rm -it -u "$(id -u):$(id -g)" -v "$HOME:$HOME" -w "$(pwd)" astefanutti/decktape "$htmlfile" "$pdffile"
+docker container inspect nginx-preso >/dev/null 2>&1
+nginx_running_rc=$?
+
+if [ $nginx_running_rc != 0 ]; then
+  echo "Running a webserver to avoid CORS errors"
+  local/run-nginx.sh
+fi
+
+docker run --rm -it -u "$(id -u):$(id -g)" -v "$HOME:$HOME" -w "$(pwd)" \
+  --net container:nginx-preso \
+  astefanutti/decktape "http://localhost:8080/$htmlfile" "$pdffile"
+
+if [ $nginx_running_rc != 0 ]; then
+  docker stop nginx-preso
+fi
 

docker-intro/README.md

@@ -0,0 +1,8 @@
+# Docker Build
+
+- [Presentation](https://sudo-bmitch.github.io/presentations/docker-intro/presentation.html)
+
+Image credits:
+
+- https://www.flickr.com/photos/photohome_uk/1494590209
+