Update for Berlin workshop

autotest/autotest.py

@@ -143,7 +143,11 @@ for current_action, next_action in zip(actions, actions[1:]+[("bash", "true")]):
     popen_options = dict(shell=True, cwd=cwd, stdin=subprocess.PIPE, preexec_fn=os.setpgrp)
     # The follow hack allows to capture the environment variables set by `docker-machine env`
     # FIXME: this doesn't handle `unset` for now
-    if "eval $(docker-machine env" in current_action[1]:
+    if any([
+        "eval $(docker-machine env" in current_action[1],
+        "DOCKER_HOST" in current_action[1],
+        "COMPOSE_FILE" in current_action[1],
+        ]):
         popen_options["stdout"] = subprocess.PIPE
         current_action[1] += "\nenv"
     proc = subprocess.Popen(current_action[1], **popen_options)

dockercoins/docker-compose.yml-logging

@@ -4,7 +4,7 @@ rng:
   - "8001:80"
   log_driver: gelf
   log_opt:
-    gelf-address: "udp://AA.BB.CC.DD:EEEEE"
+    gelf-address: "udp://127.0.0.1:EEEEE"
 
 hasher:
   build: hasher
@@ -12,7 +12,7 @@ hasher:
   - "8002:80"
   log_driver: gelf
   log_opt:
-    gelf-address: "udp://AA.BB.CC.DD:EEEEE"
+    gelf-address: "udp://127.0.0.1:EEEEE"
 
 webui:
   build: webui
@@ -24,13 +24,13 @@ webui:
   - "./webui/files/:/files/"
   log_driver: gelf
   log_opt:
-    gelf-address: "udp://AA.BB.CC.DD:EEEEE"
+    gelf-address: "udp://127.0.0.1:EEEEE"
 
 redis:
   image: redis
   log_driver: gelf
   log_opt:
-    gelf-address: "udp://AA.BB.CC.DD:EEEEE"
+    gelf-address: "udp://127.0.0.1:EEEEE"
 
 worker:
   build: worker
@@ -40,5 +40,5 @@ worker:
   - redis
   log_driver: gelf
   log_opt:
-    gelf-address: "udp://AA.BB.CC.DD:EEEEE"
+    gelf-address: "udp://127.0.0.1:EEEEE"
 

dockercoins/webui/files/index.html

@@ -50,7 +50,7 @@ function refresh () {
             points.push({ x: s2.now, y: speed });
         }
         $("#speed").text("~" + speed.toFixed(1) + " hashes/second");
-        var msg = ("I'm attending the @docker workshop at @praqma, "
+        var msg = ("I'm attending the @docker workshop at @neofonie, "
                    + "and my #DockerCoins mining rig is crunching "
                    + speed.toFixed(1) + " hashes/second! W00T!");
         $("#tweet").attr(