Update versions, schedule, and twitter button

This commit is contained in:
Jerome Petazzoni
2016-02-08 07:24:50 -08:00
parent edf3aeb9c4
commit 661948d162
3 changed files with 55 additions and 28 deletions

View File

@@ -2,13 +2,16 @@
<html>
<head>
<title>DockerCoin Miner WebUI</title>
<link rel="stylesheet" type="text/css" href="rickshaw.min.css">
<link rel="stylesheet" type="text/css" href="rickshaw.min.css">
<style>
#graph {
background-color: #eee;
width: 800px;
height: 400px;
}
#tweet {
color: royalblue;
}
</style>
<script src="jquery.js"></script>
<script src="d3.min.js"></script>
@@ -38,13 +41,22 @@ function refresh () {
while (points.length > 0) {
points.pop();
}
var speed;
for (var i=0; i<series.length-1; i++) {
// Compute instantaneous speed
var s1 = series[i];
var s2 = series[i+1];
var speed = (s2.hashes-s1.hashes)/(s2.now-s1.now);
speed = (s2.hashes-s1.hashes)/(s2.now-s1.now);
points.push({ x: s2.now, y: speed });
}
$("#speed").text("~" + speed.toFixed(1) + " hashes/second");
var msg = ("I'm attending the @docker Swarm workshop at @ZenikaIT, "
+ "and my #DockerCoins mining rig is crunching "
+ speed.toFixed(1) + " hashes/second! W00T!");
$("#tweet").attr(
"href",
"https://twitter.com/intent/tweet?text="+encodeURIComponent(msg)
);
if (graph == null) {
graph = new Rickshaw.Graph({
renderer: "area",
@@ -56,7 +68,7 @@ function refresh () {
series: [
{ name: "Coins",
color: "steelblue",
data: points
data: points
}
]
});
@@ -89,5 +101,11 @@ $(function () {
<div id="graph"></div>
<h2>
Current mining speed:
<span id="speed">-</span>
<a id="tweet" href="#">(Tweet this!)</a>
</h2>
</body>
</html>

View File

@@ -1,5 +1,9 @@
pssh -I tee /tmp/postprep.py <<EOF
#!/usr/bin/env python
COMPOSE_VERSION = "1.6.0"
MACHINE_VERSION = "0.6.0"
SWARM_VERSION = "1.1.0"
import os
import sys
import urllib
@@ -25,16 +29,18 @@ while addresses:
if myaddr == cluster[0]:
os.system("[ -f .ssh/id_rsa ] || ssh-keygen -t rsa -f .ssh/id_rsa -P ''")
os.system("sudo apt-get remove -y --purge dnsmasq-base")
os.system("sudo apt-get -qy install python-setuptools pssh apache2-utils httping htop unzip")
os.system("sudo easy_install pip")
os.system("sudo pip install docker-compose==1.5.2")
os.system("docker pull swarm:1.0.1")
os.system("docker tag -f swarm:1.0.1 swarm")
#os.system("sudo curl -L https://github.com/docker/machine/releases/download/v0.5.6/docker-machine_linux-amd64.zip -o /tmp/docker-machine.zip")
os.system("sudo pip uninstall -y docker-compose")
#os.system("sudo pip install docker-compose=={}".format(COMPOSE_VERSION))
os.system("sudo curl -sSL -o /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/{}/docker-compose-$(uname -s)-$(uname -m)".format(COMPOSE_VERSION))
os.system("sudo chmod +x /usr/local/bin/docker-compose")
os.system("docker pull swarm:{}".format(SWARM_VERSION))
os.system("docker tag -f swarm:{} swarm".format(SWARM_VERSION))
#os.system("sudo curl -sSL https://github.com/docker/machine/releases/download/v{}/docker-machine_linux-amd64.zip -o /tmp/docker-machine.zip".format(MACHINE_VERSION))
#os.system("cd /usr/local/bin ; sudo unzip /tmp/docker-machine.zip")
os.system("sudo curl -L https://github.com/docker/machine/releases/download/v0.5.6/docker-machine_linux-amd64 -o /usr/local/bin/docker-machine")
os.system("sudo curl -sSL -o /usr/local/bin/docker-machine https://github.com/docker/machine/releases/download/v{}/docker-machine-$(uname -s)-$(uname -m)".format(MACHINE_VERSION))
os.system("sudo chmod +x /usr/local/bin/docker-machine*")
os.system("echo 1000000 | sudo tee /proc/sys/net/nf_conntrack_max")
#os.system("""sudo sed -i 's,^DOCKER_OPTS=.*,DOCKER_OPTS="-H unix:///var/run/docker.sock -H tcp://0.0.0.0:55555",' /etc/default/docker""")

View File

@@ -96,27 +96,28 @@ class: title
## Logistics
.small[
- Hello! I'm `jerome at docker dot com`
- Agenda:
- 2:30pm (now-ish) workshop begins
- 3:45pm (approx.) short coffee break
- 5:00pm (supposedly) workshop ends
<br/>(but we'll try to overstay if nobody kicks us out,
<br/>and do some extra fun stuff with those interested)
.small[
- 09:00-10:30 part 1
- 10:30-11:00 coffee break
- 11:00-12:30 part 2
- 12:30-13:30 lunch break
- 13:30-15:00 part 3
- 15:00-15:30 coffee break
- 15:30-17:00 part 4
- 17:00- open discussion, Q&A
]
- This will be FAST PACED, but DON'T PANIC!
<!-- - This will be FAST PACED, but DON'T PANIC! -->
- All the content is publicly available
<br/>(slides, code samples, scripts)
- Experimental chat support: #docker-workshop on Freenode
<br/>(you can connect with https://webchat.freenode.net/)
]
- Experimental chat support on
[Gitter](https://gitter.im/jpetazzo/workshop-20160215-paris)
---
@@ -162,6 +163,7 @@ class: title
<br/>(on Windows, get [putty](http://www.putty.org/)
or [Git BASH](https://msysgit.github.io/))
- GitHub account (recommended; not mandatory)
- Gitter account (recommended; not mandatory)
- Docker Hub account (only for Swarm hands-on section)
- Basic Docker knowledge
@@ -171,6 +173,8 @@ class: title
- Create [GitHub](https://github.com/) and
[Docker Hub](https://hub.docker.com) accounts now if needed
- Go to [view.dckr.info](http://view.dckr.info) to view these slides
- Join the chat room on
[Gitter](https://gitter.im/jpetazzo/workshop-20160215-paris)
]
@@ -199,13 +203,13 @@ be run from the first VM, `node1`**.]
## Brand new versions!
- Engine 1.9.1
- Engine 1.10.0
- Compose 1.5.2
- Compose 1.6.0
- Swarm 1.0.1
- Swarm 1.1.0
- Machine 0.5.6
- Machine 0.6.0
---
@@ -1529,9 +1533,8 @@ Let's celebrate our success!
.exercise[
- If you have a Twitter account, [tweet](
https://twitter.com/intent/tweet?text=I%27m%20attending%20the%20%40Docker%20training%20at%20%23SCALE14x%20and%20my%20DockerCoin%20rig%20is%20mining%20XXX%20%23DockerCoins%20per%20second!%20Woot!%20%5Co%2F")
about your awesome Docker deployment skills!
- If you have a Twitter account, tweet your mining speed!
</br>(use the "Tweet this!" link below the graph☺)
]