Last updates for dod msp

Add details about least privilege model
short version for DoD MSP
2026-03-02 01:10:20 +00:00 · 2017-07-25 11:55:22 -05:00 · 2017-07-24 23:48:29 -05:00 · 2017-07-24 15:34:06 -05:00 · 2017-07-12 13:41:45 +02:00 · 2017-07-12 13:41:37 +02:00
6 changed files with 1690 additions and 222 deletions
--- a/docs/chat/index.html
+++ b/docs/chat/index.html
@@ -1,9 +1,9 @@
 <html>
 <!-- Generated with index.html.sh -->
 <head>
-<meta http-equiv="refresh" content="0; URL='https://gitter.im/jpetazzo/workshop-20170508-austin'" />
+<meta http-equiv="refresh" content="0; URL='https://dockercommunity.slack.com/messages/docker-mentor'" />
 </head>
 <body>
-<a href="https://gitter.im/jpetazzo/workshop-20170508-austin">https://gitter.im/jpetazzo/workshop-20170508-austin</a>
+<a href="https://dockercommunity.slack.com/messages/docker-mentor">https://dockercommunity.slack.com/messages/docker-mentor</a>
 </body>
 </html>
--- a/docs/chat/index.html.sh
+++ b/docs/chat/index.html.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-LINK=https://gitter.im/jpetazzo/workshop-20170508-austin
-#LINK=https://dockercommunity.slack.com/messages/docker-mentor
+#LINK=https://gitter.im/jpetazzo/workshop-20170322-sanjose
+LINK=https://dockercommunity.slack.com/messages/docker-mentor
 #LINK=https://usenix-lisa.slack.com/messages/docker
 sed "s,@@LINK@@,$LINK,g" >index.html <<EOF
 <html>
--- a/docs/extra-details.png
+++ b/docs/extra-details.png
--- a/docs/index.html
+++ b/docs/index.html
--- a/prepare-vms/scripts/postprep.rc
+++ b/prepare-vms/scripts/postprep.rc
@@ -123,7 +123,12 @@ system("echo 1000000 | sudo tee /proc/sys/net/nf_conntrack_max")
 #######################

 # This will install the latest Docker.
-system("curl --silent https://{}/ | grep -v '( set -x; sleep 20 )' | sudo sh".format(ENGINE_VERSION))
+#system("curl --silent https://{}/ | grep -v '( set -x; sleep 20 )' | sudo sh".format(ENGINE_VERSION))
+system("sudo apt-get -qy install apt-transport-https ca-certificates curl software-properties-common")
+system("curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -")
+system("sudo add-apt-repository 'deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial {}'".format(ENGINE_VERSION))
+system("sudo apt-get -q update")
+system("sudo apt-get -qy install docker-ce")

 ### Install docker-compose
 #system("sudo pip install -U docker-compose=={}".format(COMPOSE_VERSION))
@@ -142,8 +147,8 @@ system("sudo apt-get -qy install python-setuptools pssh apache2-utils httping ht
 system("while ! sudo -u docker docker version ; do sleep 2; done")

 ### Install Swarm
-system("docker pull swarm:{}".format(SWARM_VERSION))
-system("docker tag -f swarm:{} swarm".format(SWARM_VERSION))
+#system("docker pull swarm:{}".format(SWARM_VERSION))
+#system("docker tag -f swarm:{} swarm".format(SWARM_VERSION))

 ### BEGIN CLUSTERING ###

@@ -197,5 +202,5 @@ pssh "grep docker@ /home/docker/.ssh/authorized_keys \
        | sudo -u docker tee -a /home/docker/.ssh/authorized_keys"

 # On node1, create and deploy TLS certs using Docker Machine
-pssh "if grep -q node1 /tmp/node; then grep ' node' /etc/hosts | xargs -n2 sudo -H -u docker docker-machine create -d generic --generic-ssh-user docker --generic-ip-address; fi"
+#pssh "if grep -q node1 /tmp/node; then grep ' node' /etc/hosts | xargs -n2 sudo -H -u docker docker-machine create -d generic --generic-ssh-user docker --generic-ip-address; fi"

--- a/prepare-vms/settings/orchestration.yaml
+++ b/prepare-vms/settings/orchestration.yaml
@@ -27,7 +27,7 @@ footer: >

 url: http://container.training/

-engine_version: get.docker.com
+engine_version: stable
 compose_version: 1.12.0
-machine_version: 0.11.0
+machine_version: 0.12.2
 swarm_version: latest
Author	SHA1	Message	Date
Jérôme Petazzoni	a4e62e0880	Last updates for dod msp	2017-07-25 11:55:22 -05:00
Jérôme Petazzoni	b2941ce447	Add details about least privilege model	2017-07-24 23:48:29 -05:00
Jérôme Petazzoni	84c88ed4c2	short version for DoD MSP	2017-07-24 15:34:06 -05:00
Jérôme Petazzoni	0d7ee1dda0	Merge branch 'alexellis-alexellis-patch-sol'	2017-07-12 13:41:45 +02:00
Jérôme Petazzoni	243d585432	Add a few details about what happens when losing the sole manager	2017-07-12 13:41:37 +02:00
Alex Ellis	f5fe7152f3	Internationalisation I had no idea what SOL was - had to google this on Urban Dictionary :-/ have put an internationalisation in and retained the colliqualism in brackets.	2017-07-11 19:00:23 +01:00
Jérôme Petazzoni	94d9ad22d0	Add ngrep details when using PWD or Vagrant re/ interface selection (closes #84 )	2017-07-11 19:51:00 +02:00
Jérôme Petazzoni	0af160e0a8	Merge pull request #82 from adulescentulus/fix_visualizer_exercise (some) wrong instructions	2017-06-17 09:31:31 -07:00
Andreas Groll	1fdb7b8077	added missing stackname	2017-06-12 15:25:35 +02:00
Andreas Groll	d2b67c426e	you only can connect to the ip where you started your visualizer	2017-06-12 12:07:59 +02:00
Jérôme Petazzoni	a84cc36cd8	Update installation method	2017-06-09 18:16:29 +02:00
Jerome Petazzoni	c8ecf5a647	PYCON final check!	2017-05-17 18:14:33 -07:00
Jerome Petazzoni	e9ee050386	Explain extra details	2017-05-17 15:56:28 -07:00
Jerome Petazzoni	6e59e2092c	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop	2017-05-17 15:00:42 -07:00
Jerome Petazzoni	c7b0fd32bd	Add detail about ASGs	2017-05-17 15:00:31 -07:00
Jérôme Petazzoni	ead4e33604	Merge pull request #79 from jliu70/oscon2017 fix typo	2017-05-17 14:31:26 -07:00
Jérôme Petazzoni	96b4f76c67	Backport all changes from OSCON	2017-05-17 00:17:24 -05:00
Jeff Liu	6337d49123	fix typo	2017-05-08 10:21:51 -05:00