Skip to content

Commit cd00a08

Browse files
alexei-ledalexei-led
committed
merge
2 parents ec0ec47 + ed9bba9 commit cd00a08

File tree

4 files changed

+66
-63
lines changed

4 files changed

+66
-63
lines changed

‎result/views/index.html

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
<!DOCTYPE html>
22
<html ng-app="catsvsdogs">
3-
<head>
3+
4+
<head>
45
<meta charset="utf-8">
5-
<title>Cats vs Dogs -- Result</title>
6+
<title>Tugbot vs Pumba -- Result</title>
67
<base href="/index.html">
7-
<meta name = "viewport" content = "width=device-width, initial-scale = 1.0">
8+
<meta name="viewport" content="width=device-width, initial-scale = 1.0">
89
<meta name="keywords" content="docker-compose, docker, stack">
910
<meta name="author" content="Docker">
1011
<link rel='stylesheet' href='/stylesheets/style.css' />
11-
</head>
12-
<body ng-controller="statsCtrl" >
13-
<div id="background-stats">
14-
<div id="background-stats-1">
15-
</div><!--
16-
--><div id="background-stats-2">
17-
</div>
12+
</head>
13+
14+
<body ng-controller="statsCtrl">
15+
<div id="background-stats">
16+
<div id="background-stats-1">
17+
</div>
18+
<!--
19+
-->
20+
<div id="background-stats-2">
21+
</div>
1822
</div>
1923
<div id="content-container">
20-
<div id="content-container-center">
21-
<div id="choice">
22-
<div class="choice cats">
23-
<div class="label">Cats</div>
24-
<div class="stat">{{aPercent | number:1}}%</div>
25-
</div>
26-
<div class="divider"></div>
27-
<div class="choice dogs">
28-
<div class="label">Dogs</div>
29-
<div class="stat">{{bPercent | number:1}}%</div>
30-
</div>
24+
<div id="content-container-center">
25+
<div id="choice">
26+
<div class="choice cats">
27+
<div class="label">Tugbot</div>
28+
<div class="stat">{{aPercent | number:1}}%</div>
29+
</div>
30+
<div class="divider"></div>
31+
<div class="choice dogs">
32+
<div class="label">Pumba</div>
33+
<div class="stat">{{bPercent | number:1}}%</div>
34+
</div>
35+
</div>
3136
</div>
32-
</div>
3337
</div>
3438
<div id="result">
35-
<span ng-if="total == 0">No votes yet</span>
36-
<span ng-if="total == 1">{{total}} vote</span>
37-
<span ng-if="total >= 2">{{total}} votes</span>
39+
<span ng-if="total == 0">No votes yet</span>
40+
<span ng-if="total == 1">{{total}} vote</span>
41+
<span ng-if="total >= 2">{{total}} votes</span>
3842
</div>
3943
<script src="socket.io.js"></script>
4044
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
4145
<script src="app.js"></script>
42-
</body>
43-
</html>
46+
</body>
47+
48+
</html>

‎swarm/0_swarm_cluster_mac.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ for i in $(seq "${NUM_WORKERS}"); do
3535
done
3636

3737
# show swarm cluster
38-
echo "Local Swarm Cluster"
39-
echo "==================="
38+
printf "\nLocal Swarm Cluster\n===================\n"
4039

4140
docker node ls
4241

4342
# echo swarm visualizer
44-
echo "Local Swarm Visualizer"
45-
echo "==================="
43+
printf "\nLocal Swarm Visualizer\n===================\n"
4644
docker run -it -d --name swarm_visuzalizer \
4745
-p 8000:8000 -e HOST=localhost -e PORT=8000 \
4846
-v /var/run/docker.sock:/var/run/docker.sock \

0 commit comments

Comments
 (0)