diff --git a/prepare-vms/Dockerfile b/prepare-vms/Dockerfile index 6b6d83d5..8a062f08 100644 --- a/prepare-vms/Dockerfile +++ b/prepare-vms/Dockerfile @@ -14,11 +14,20 @@ RUN apt-get update && apt-get install -y \ python-docutils \ python-pip \ ssh \ + unzip \ wkhtmltopdf \ xvfb \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* +ARG TERRAFORM_VERSION=0.11.13 +RUN curl -s https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ + -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ + && unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ + && mv terraform /usr/local/bin \ + && rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip + + RUN pip install \ awscli \ jinja2 \ diff --git a/slides/containers/Multi_Stage_Builds.md b/slides/containers/Multi_Stage_Builds.md index 8f0f572b..29cb3d48 100644 --- a/slides/containers/Multi_Stage_Builds.md +++ b/slides/containers/Multi_Stage_Builds.md @@ -311,5 +311,3 @@ virtually "free." (Instead of using multiple Dockerfiles, which could go out of sync) * Sometimes, we want to inspect a specific intermediary build stage. - -* Or, we want to describe multiple images using a single Dockerfile. diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index 6adfc7ca..d4ae9278 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -2,8 +2,8 @@ title: | Introduction to Containers -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" +chat: "[Gitter](https://gitter.im/enix/univ-caen-intro-docker)" gitrepo: github.com/jpetazzo/container.training diff --git a/slides/logistics.md b/slides/logistics.md index 751ba67c..e8ccba4b 100644 --- a/slides/logistics.md +++ b/slides/logistics.md @@ -1,12 +1,7 @@ ## Intros -## FIXME -- This slide should be customized by the tutorial instructor(s). - -- Hello! We are/I am: - - - .emoji[👨] Julien (Enix) +- I am: .emoji[👨] Julien (Zempashi on GitHub) (Enix SAS) -- The workshop will run from ... +- The workshop will run from 9:00 to 17:00 -- There will be a lunch break at ... +- There will be a lunch break around 12:30 (And coffee breaks!) diff --git a/slides/shared/title.md b/slides/shared/title.md index 4ab52435..11f4d381 100644 --- a/slides/shared/title.md +++ b/slides/shared/title.md @@ -10,12 +10,14 @@ class: title, in-person @@TITLE@@

+ .footnote[ -**Be kind to the WiFi!**
- +*Room*: Mecure
+ **Slides: @@SLIDES@@** ]