Skip to content

Commit ac6ef5f

Browse files
author
Jesse Seldess
authored
Merge pull request cockroachdb#3143 from a-robinson/compose-training
Fix docker network names in partition troubleshooting exercise
2 parents e63443e + be2d012 commit ac6ef5f

File tree

6 files changed

+87
-108
lines changed

6 files changed

+87
-108
lines changed

‎v1.1/training/network-partition-troubleshooting.md

+6-17
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
6666

6767
{% include copy-clipboard.html %}
6868
~~~ shell
69-
$ docker network disconnect cockroachdbtraining_shared roach-4
69+
$ docker network disconnect cockroachdb-training-shared roach-4
7070
~~~~
7171

7272
{% include copy-clipboard.html %}
7373
~~~ shell
74-
$ docker network disconnect cockroachdbtraining_shared roach-5
74+
$ docker network disconnect cockroachdb-training-shared roach-5
7575
~~~~
7676

7777
## Step 3. Troubleshoot the problem
@@ -155,12 +155,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
155155
156156
{% include copy-clipboard.html %}
157157
~~~ shell
158-
$ docker network connect cockroachdbtraining_shared roach-4
158+
$ docker network connect cockroachdb-training-shared roach-4
159159
~~~~
160160
161161
{% include copy-clipboard.html %}
162162
~~~ shell
163-
$ docker network connect cockroachdbtraining_shared roach-5
163+
$ docker network connect cockroachdb-training-shared roach-5
164164
~~~~
165165
166166
2. After a few seconds, you should see the nodes go back to healthy again.
@@ -171,22 +171,11 @@ You won't be using this Docker cluster in any other labs, so take a moment to cl
171171

172172
1. In the terminal where you ran `docker-compose up`, press **CTRL-C** to stop all the CockroachDB nodes.
173173

174-
2. Delete the Docker containers:
174+
2. Delete all Docker resources created by the tutorial:
175175

176176
{% include copy-clipboard.html %}
177177
~~~ shell
178-
$ docker rm roach-0 roach-1 roach-2 roach-3 roach-4 roach-5
179-
~~~
180-
181-
3. Delete the Docker networks:
182-
183-
{% include copy-clipboard.html %}
184-
~~~ shell
185-
$ docker network rm \
186-
cockroachdbtraining_shared \
187-
cockroachdbtraining_dc0 \
188-
cockroachdbtraining_dc1 \
189-
cockroachdbtraining_dc2
178+
$ docker-compose down
190179
~~~
191180

192181
## What's Next?

‎v1.1/training/resources/docker-compose.yaml

+27-23
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
version: '2.1'
1+
version: '3.5'
22

33
networks:
4-
shared:
4+
cockroachdb-training-shared:
5+
name: cockroachdb-training-shared
56
driver: bridge
6-
dc0:
7+
cockroachdb-training-dc0:
8+
name: cockroachdb-training-dc0
79
driver: bridge
8-
dc1:
10+
cockroachdb-training-dc1:
11+
name: cockroachdb-training-dc1
912
driver: bridge
10-
dc2:
13+
cockroachdb-training-dc2:
14+
name: cockroachdb-training-dc2
1115
driver: bridge
1216

1317
services:
@@ -17,10 +21,10 @@ services:
1721
roach-0:
1822
container_name: roach-0
1923
hostname: roach-0
20-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
24+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
2125
networks:
22-
- shared
23-
- dc0
26+
- cockroachdb-training-shared
27+
- cockroachdb-training-dc0
2428
command: start --logtostderr --insecure --locality=datacenter=dc-0 --join=roach-0,roach-1,roach-2
2529
ports:
2630
- 8080:8080
@@ -29,10 +33,10 @@ services:
2933
roach-1:
3034
container_name: roach-1
3135
hostname: roach-1
32-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
36+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
3337
networks:
34-
- shared
35-
- dc0
38+
- cockroachdb-training-shared
39+
- cockroachdb-training-dc0
3640
command: start --logtostderr --insecure --locality=datacenter=dc-0 --join=roach-0,roach-1,roach-2
3741
ports:
3842
- 8081:8080
@@ -43,10 +47,10 @@ services:
4347
roach-2:
4448
container_name: roach-2
4549
hostname: roach-2
46-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
50+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
4751
networks:
48-
- shared
49-
- dc1
52+
- cockroachdb-training-shared
53+
- cockroachdb-training-dc1
5054
command: start --logtostderr --insecure --locality=datacenter=dc-1 --join=roach-0,roach-1,roach-2
5155
ports:
5256
- 8082:8080
@@ -55,10 +59,10 @@ services:
5559
roach-3:
5660
container_name: roach-3
5761
hostname: roach-3
58-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
62+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
5963
networks:
60-
- shared
61-
- dc1
64+
- cockroachdb-training-shared
65+
- cockroachdb-training-dc1
6266
command: start --logtostderr --insecure --locality=datacenter=dc-1 --join=roach-0,roach-1,roach-2
6367
ports:
6468
- 8083:8080
@@ -69,10 +73,10 @@ services:
6973
roach-4:
7074
container_name: roach-4
7175
hostname: roach-4
72-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
76+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
7377
networks:
74-
- shared
75-
- dc2
78+
- cockroachdb-training-shared
79+
- cockroachdb-training-dc2
7680
command: start --logtostderr --insecure --locality=datacenter=dc-2 --join=roach-0,roach-1,roach-2
7781
ports:
7882
- 8084:8080
@@ -81,10 +85,10 @@ services:
8185
roach-5:
8286
container_name: roach-5
8387
hostname: roach-5
84-
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.5}
88+
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v1.1.8}
8589
networks:
86-
- shared
87-
- dc2
90+
- cockroachdb-training-shared
91+
- cockroachdb-training-dc2
8892
command: start --logtostderr --insecure --locality=datacenter=dc-2 --join=roach-0,roach-1,roach-2
8993
ports:
9094
- 8085:8080

‎v2.0/training/network-partition-troubleshooting.md

+6-17
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
6666

6767
{% include copy-clipboard.html %}
6868
~~~ shell
69-
$ docker network disconnect cockroachdbtraining_shared roach-4
69+
$ docker network disconnect cockroachdb-training-shared roach-4
7070
~~~~
7171

7272
{% include copy-clipboard.html %}
7373
~~~ shell
74-
$ docker network disconnect cockroachdbtraining_shared roach-5
74+
$ docker network disconnect cockroachdb-training-shared roach-5
7575
~~~~
7676

7777
## Step 3. Troubleshoot the problem
@@ -155,12 +155,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
155155
156156
{% include copy-clipboard.html %}
157157
~~~ shell
158-
$ docker network connect cockroachdbtraining_shared roach-4
158+
$ docker network connect cockroachdb-training-shared roach-4
159159
~~~~
160160
161161
{% include copy-clipboard.html %}
162162
~~~ shell
163-
$ docker network connect cockroachdbtraining_shared roach-5
163+
$ docker network connect cockroachdb-training-shared roach-5
164164
~~~~
165165
166166
2. After a few seconds, you should see the nodes go back to healthy again.
@@ -171,22 +171,11 @@ You won't be using this Docker cluster in any other labs, so take a moment to cl
171171

172172
1. In the terminal where you ran `docker-compose up`, press **CTRL-C** to stop all the CockroachDB nodes.
173173

174-
2. Delete the Docker containers:
174+
2. Delete all Docker resources created by the tutorial:
175175

176176
{% include copy-clipboard.html %}
177177
~~~ shell
178-
$ docker rm roach-0 roach-1 roach-2 roach-3 roach-4 roach-5
179-
~~~
180-
181-
3. Delete the Docker networks:
182-
183-
{% include copy-clipboard.html %}
184-
~~~ shell
185-
$ docker network rm \
186-
cockroachdbtraining_shared \
187-
cockroachdbtraining_dc0 \
188-
cockroachdbtraining_dc1 \
189-
cockroachdbtraining_dc2
178+
$ docker-compose down
190179
~~~
191180

192181
## What's Next?

‎v2.0/training/resources/docker-compose.yaml

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
version: '2.1'
1+
version: '3.5'
22

33
networks:
4-
shared:
4+
cockroachdb-training-shared:
5+
name: cockroachdb-training-shared
56
driver: bridge
6-
dc0:
7+
cockroachdb-training-dc0:
8+
name: cockroachdb-training-dc0
79
driver: bridge
8-
dc1:
10+
cockroachdb-training-dc1:
11+
name: cockroachdb-training-dc1
912
driver: bridge
10-
dc2:
13+
cockroachdb-training-dc2:
14+
name: cockroachdb-training-dc2
1115
driver: bridge
1216

1317
services:
@@ -19,8 +23,8 @@ services:
1923
hostname: roach-0
2024
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
2125
networks:
22-
- shared
23-
- dc0
26+
- cockroachdb-training-shared
27+
- cockroachdb-training-dc0
2428
command: start --logtostderr --insecure --locality=datacenter=dc-0 --join=roach-0,roach-1,roach-2
2529
ports:
2630
- 8080:8080
@@ -31,8 +35,8 @@ services:
3135
hostname: roach-1
3236
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
3337
networks:
34-
- shared
35-
- dc0
38+
- cockroachdb-training-shared
39+
- cockroachdb-training-dc0
3640
command: start --logtostderr --insecure --locality=datacenter=dc-0 --join=roach-0,roach-1,roach-2
3741
ports:
3842
- 8081:8080
@@ -45,8 +49,8 @@ services:
4549
hostname: roach-2
4650
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
4751
networks:
48-
- shared
49-
- dc1
52+
- cockroachdb-training-shared
53+
- cockroachdb-training-dc1
5054
command: start --logtostderr --insecure --locality=datacenter=dc-1 --join=roach-0,roach-1,roach-2
5155
ports:
5256
- 8082:8080
@@ -57,8 +61,8 @@ services:
5761
hostname: roach-3
5862
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
5963
networks:
60-
- shared
61-
- dc1
64+
- cockroachdb-training-shared
65+
- cockroachdb-training-dc1
6266
command: start --logtostderr --insecure --locality=datacenter=dc-1 --join=roach-0,roach-1,roach-2
6367
ports:
6468
- 8083:8080
@@ -71,8 +75,8 @@ services:
7175
hostname: roach-4
7276
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
7377
networks:
74-
- shared
75-
- dc2
78+
- cockroachdb-training-shared
79+
- cockroachdb-training-dc2
7680
command: start --logtostderr --insecure --locality=datacenter=dc-2 --join=roach-0,roach-1,roach-2
7781
ports:
7882
- 8084:8080
@@ -83,8 +87,8 @@ services:
8387
hostname: roach-5
8488
image: cockroachdb/cockroach:${COCKROACH_VERSION:-v2.0.0}
8589
networks:
86-
- shared
87-
- dc2
90+
- cockroachdb-training-shared
91+
- cockroachdb-training-dc2
8892
command: start --logtostderr --insecure --locality=datacenter=dc-2 --join=roach-0,roach-1,roach-2
8993
ports:
9094
- 8085:8080

‎v2.1/training/network-partition-troubleshooting.md

+6-17
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
6666

6767
{% include copy-clipboard.html %}
6868
~~~ shell
69-
$ docker network disconnect cockroachdbtraining_shared roach-4
69+
$ docker network disconnect cockroachdb-training-shared roach-4
7070
~~~~
7171

7272
{% include copy-clipboard.html %}
7373
~~~ shell
74-
$ docker network disconnect cockroachdbtraining_shared roach-5
74+
$ docker network disconnect cockroachdb-training-shared roach-5
7575
~~~~
7676

7777
## Step 3. Troubleshoot the problem
@@ -155,12 +155,12 @@ Note that this lab involves running a cluster in Docker so that you can use it t
155155
156156
{% include copy-clipboard.html %}
157157
~~~ shell
158-
$ docker network connect cockroachdbtraining_shared roach-4
158+
$ docker network connect cockroachdb-training-shared roach-4
159159
~~~~
160160
161161
{% include copy-clipboard.html %}
162162
~~~ shell
163-
$ docker network connect cockroachdbtraining_shared roach-5
163+
$ docker network connect cockroachdb-training-shared roach-5
164164
~~~~
165165
166166
2. After a few seconds, you should see the nodes go back to healthy again.
@@ -171,22 +171,11 @@ You won't be using this Docker cluster in any other labs, so take a moment to cl
171171

172172
1. In the terminal where you ran `docker-compose up`, press **CTRL-C** to stop all the CockroachDB nodes.
173173

174-
2. Delete the Docker containers:
174+
2. Delete all Docker resources created by the tutorial:
175175

176176
{% include copy-clipboard.html %}
177177
~~~ shell
178-
$ docker rm roach-0 roach-1 roach-2 roach-3 roach-4 roach-5
179-
~~~
180-
181-
3. Delete the Docker networks:
182-
183-
{% include copy-clipboard.html %}
184-
~~~ shell
185-
$ docker network rm \
186-
cockroachdbtraining_shared \
187-
cockroachdbtraining_dc0 \
188-
cockroachdbtraining_dc1 \
189-
cockroachdbtraining_dc2
178+
$ docker-compose down
190179
~~~
191180

192181
## What's Next?

0 commit comments

Comments
 (0)