From f0d991cd02664aaec595a8d9c2992e9081c20ab4 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 11 Jul 2019 04:43:13 -0500 Subject: [PATCH 1/2] Bump versions --- prepare-vms/lib/commands.sh | 2 +- prepare-vms/settings/admin-dmuc.yaml | 2 +- prepare-vms/settings/admin-kubenet.yaml | 2 +- prepare-vms/settings/admin-kuberouter.yaml | 2 +- prepare-vms/settings/admin-test.yaml | 2 +- prepare-vms/settings/example.yaml | 2 +- prepare-vms/settings/fundamentals.yaml | 2 +- prepare-vms/settings/jerome.yaml | 2 +- prepare-vms/settings/kube101.yaml | 2 +- prepare-vms/settings/swarm.yaml | 2 +- slides/k8s/logs-cli.md | 2 +- slides/k8s/versions-k8s.md | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh index 9ca85179..dba89594 100644 --- a/prepare-vms/lib/commands.sh +++ b/prepare-vms/lib/commands.sh @@ -229,7 +229,7 @@ EOF" pssh " if [ ! -x /usr/local/bin/stern ]; then ##VERSION## - sudo curl -L -o /usr/local/bin/stern https://github.com/wercker/stern/releases/download/1.10.0/stern_linux_amd64 && + sudo curl -L -o /usr/local/bin/stern https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 && sudo chmod +x /usr/local/bin/stern && stern --completion bash | sudo tee /etc/bash_completion.d/stern fi" diff --git a/prepare-vms/settings/admin-dmuc.yaml b/prepare-vms/settings/admin-dmuc.yaml index a7d776a8..d4587009 100644 --- a/prepare-vms/settings/admin-dmuc.yaml +++ b/prepare-vms/settings/admin-dmuc.yaml @@ -21,7 +21,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/admin-kubenet.yaml b/prepare-vms/settings/admin-kubenet.yaml index 52046831..b18cb5de 100644 --- a/prepare-vms/settings/admin-kubenet.yaml +++ b/prepare-vms/settings/admin-kubenet.yaml @@ -21,7 +21,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/admin-kuberouter.yaml b/prepare-vms/settings/admin-kuberouter.yaml index f894c5f4..97f5283d 100644 --- a/prepare-vms/settings/admin-kuberouter.yaml +++ b/prepare-vms/settings/admin-kuberouter.yaml @@ -21,7 +21,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/admin-test.yaml b/prepare-vms/settings/admin-test.yaml index 57d1339b..7390a51c 100644 --- a/prepare-vms/settings/admin-test.yaml +++ b/prepare-vms/settings/admin-test.yaml @@ -21,7 +21,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/example.yaml b/prepare-vms/settings/example.yaml index 5f814c9d..0275373f 100644 --- a/prepare-vms/settings/example.yaml +++ b/prepare-vms/settings/example.yaml @@ -23,7 +23,7 @@ paper_margin: 0.2in engine_version: test # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.18.0 +compose_version: 1.24.1 machine_version: 0.13.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/fundamentals.yaml index 48a1d95e..6c04c682 100644 --- a/prepare-vms/settings/fundamentals.yaml +++ b/prepare-vms/settings/fundamentals.yaml @@ -23,7 +23,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.22.0 +compose_version: 1.24.1 machine_version: 0.15.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/jerome.yaml b/prepare-vms/settings/jerome.yaml index 78014b55..a618cc5a 100644 --- a/prepare-vms/settings/jerome.yaml +++ b/prepare-vms/settings/jerome.yaml @@ -21,7 +21,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/kube101.yaml b/prepare-vms/settings/kube101.yaml index 4f89305c..4c79a254 100644 --- a/prepare-vms/settings/kube101.yaml +++ b/prepare-vms/settings/kube101.yaml @@ -23,7 +23,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 +compose_version: 1.24.1 machine_version: 0.14.0 # Password used to connect with the "docker user" diff --git a/prepare-vms/settings/swarm.yaml b/prepare-vms/settings/swarm.yaml index 67512cba..cbc6a010 100644 --- a/prepare-vms/settings/swarm.yaml +++ b/prepare-vms/settings/swarm.yaml @@ -23,7 +23,7 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.22.0 +compose_version: 1.24.1 machine_version: 0.15.0 # Password used to connect with the "docker user" diff --git a/slides/k8s/logs-cli.md b/slides/k8s/logs-cli.md index fe12f466..5a9a6c1a 100644 --- a/slides/k8s/logs-cli.md +++ b/slides/k8s/logs-cli.md @@ -62,7 +62,7 @@ Exactly what we need! - The following commands will install Stern on a Linux Intel 64 bit machine: ```bash sudo curl -L -o /usr/local/bin/stern \ - https://github.com/wercker/stern/releases/download/1.10.0/stern_linux_amd64 + https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 sudo chmod +x /usr/local/bin/stern ``` diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index b12c45af..6eda0bb2 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -1,8 +1,8 @@ ## Versions installed - Kubernetes 1.15.0 -- Docker Engine 18.09.6 -- Docker Compose 1.21.1 +- Docker Engine 18.09.7 +- Docker Compose 1.24.1 From 45ac1768a314dd282e8b5ad58490f0de0804d399 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 11 Jul 2019 04:44:55 -0500 Subject: [PATCH 2/2] Fancy git redirect --- slides/_redirects | 3 +++ 1 file changed, 3 insertions(+) diff --git a/slides/_redirects b/slides/_redirects index 142cc30f..e7606e61 100644 --- a/slides/_redirects +++ b/slides/_redirects @@ -2,3 +2,6 @@ #/ /kube-halfday.yml.html 200 #/ /kube-fullday.yml.html 200 #/ /kube-twodays.yml.html 200 + +# And this allows to do "git clone https://container.training". +/info/refs service=git-upload-pack https://github.com/jpetazzo/container.training/info/refs?service=git-upload-pack