Skip to content

Commit 8ccd409

Browse files
committed
cleanup and fix slides
1 parent dfd0621 commit 8ccd409

File tree

3 files changed

+121
-41
lines changed

3 files changed

+121
-41
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "1.0.0",
44
"description": "",
55
"scripts": {
6+
"build-slides": "cd slides && node build-slides.js > html/index.html",
67
"slides": "cd slides && npm start",
78
"start": "cd final/fuge && docker-compose up",
89
"stop": "cd final/fuge && docker-compose down"

slides/README.md

Lines changed: 64 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
## Developing Microservices
33
adapted from [_micro-services-iot_](https://github.com/nearform/micro-services-tutorial-iot)
44

5+
Presented by Wyatt Preul and Lloyd Benson
6+
57

68

79
### Microservices are...
@@ -44,19 +46,11 @@ adapted from [_micro-services-iot_](https://github.com/nearform/micro-services-t
4446

4547
### Prerequisites
4648
* docker 1.12.x
49+
* docker-compose
4750
* node 4 or newer
4851

4952

5053

51-
### Setup
52-
```
53-
git clone https://github.com/lloydbenson/microservices-workshop
54-
docker pull tutum/influxdb
55-
docker pull node:6-slim
56-
```
57-
58-
59-
6054
### Let's build a system...
6155
<img src="/images/target.png">
6256

@@ -77,19 +71,24 @@ docker pull node:6-slim
7771

7872

7973

80-
### You should now have
74+
### Setup
8175
```
82-
## should execute and show nothing running
83-
docker ps
84-
## should show 2 images loaded (tutum/influxdb and node)
85-
docker images
76+
### Get the Workshop
77+
git clone https://github.com/lloydbenson/microservices-workshop
78+
docker pull tutum/influxdb
79+
docker pull node:4
80+
docker-compose
81+
8682
```
8783

8884

8985

90-
### Get the Workshop
86+
### You should now have
9187
```
92-
git clone https://github.com/lloydbenson/microservices
88+
## should execute and show nothing running
89+
docker ps
90+
## should show 2 images loaded (tutum/influxdb and node)
91+
docker images
9392
```
9493

9594

@@ -104,6 +103,7 @@ git clone https://github.com/lloydbenson/microservices
104103

105104

106105
### Challenge 1
106+
Objective: Start up the InfluxDB and login into the web interface
107107
* start up the database
108108
* browse the influx web interface
109109
* hint: [https://hub.docker.com/r/tutum/influxdb]()
@@ -114,11 +114,6 @@ git clone https://github.com/lloydbenson/microservices
114114
```
115115
docker run -d -p 8083:8083 -p 8086:8086 tutum/influxdb
116116
step1/services/influx/run.sh
117-
docker-machine ip default
118-
docker ps -a | grep 'tutum/influxdb'
119-
| awk '{print $1}' | xargs docker inspect
120-
--format '\{{ .NetworkSettings.IPAddress }}'
121-
122117
[http://localhost:8083]() (influx console)
123118
```
124119

@@ -130,6 +125,7 @@ docker ps -a | grep 'tutum/influxdb'
130125

131126

132127
### Challenge 2
128+
Objective: Start the serializer and start sending data to influx
133129
* script start of challenge2/services/serializer
134130
* send data via curl
135131
* check that data was written by using the influx browser
@@ -158,6 +154,7 @@ curl -X POST --header "Content-Type:application/json"
158154

159155

160156
### Challenge 3
157+
Objective: Add serializer service and send test data
161158
* make script to start challenge3/frontend
162159
* start up influxDB frontend and serializer
163160
* use testWrite.sh|bat to send data
@@ -181,6 +178,7 @@ curl -X POST --header "Content-Type:application/json"
181178

182179

183180
### Challenge 4
181+
Objective: Use fuge to manage your containers/processes
184182
* use fuge shell to start it up
185183
* challenge4/fuge (compose-dev.yml and fuge-config.json)
186184
* hint: stop all processes/containers
@@ -205,6 +203,7 @@ curl -X POST --header "Content-Type:application/json"
205203

206204

207205
### Challenge 5
206+
Objective: Add sensor and broker
208207
* add sensor and broker to fuge yml file
209208
* hint: challenge5/services/(broker|sensor)
210209

@@ -225,6 +224,7 @@ curl -X POST --header "Content-Type:application/json"
225224

226225

227226
### Challenge 6
227+
Objective: Add actuator
228228
* add actuator to compose-dev.yml
229229
* actuator provides an offset
230230
* hint: challenge6/services/acuator
@@ -242,6 +242,7 @@ curl -X POST --header "Content-Type:application/json"
242242

243243

244244
### Challenge 7
245+
Objective: utilize tail in fuge
245246
* limit default tail to false in fuge-config.js
246247
* fuge shell and start all
247248
* tail serializer
@@ -260,6 +261,7 @@ curl -X POST --header "Content-Type:application/json"
260261

261262

262263
### Challenge 8
264+
Objective: use docker-compose
263265
* use traditional docker-compose instead to show its compatibility
264266
* hint: [https://docs.docker.com/compose]()
265267

@@ -272,6 +274,47 @@ curl -X POST --header "Content-Type:application/json"
272274

273275

274276

277+
### Challenge 9
278+
Objective: Utilize an environment file
279+
* Add an environment file
280+
* hint: [https://docs.docker.com/compose/compose-file/]().
281+
282+
283+
284+
### Solution to Challenge 9
285+
* env_file: ./dev.conf
286+
287+
288+
289+
### Challenge 10
290+
Objective: Keep a persistent database
291+
* A local data directory is already created for you.
292+
* hint: [https://docs.docker.com/compose/compose-file/]().
293+
294+
295+
296+
### Solution to Challenge 10
297+
* volumes:
298+
- "./data:/data"
299+
300+
301+
302+
### Challenge 11
303+
Objective: ??
304+
* something
305+
306+
307+
308+
### Solution to Challenge 11
309+
* solution
310+
311+
312+
313+
### Challenge 12
314+
* ALL DONE! What more should we do!?!?
315+
316+
317+
275318
### Resources
276319
* [InfluxDB Docker](https://hub.docker.com/r/tutum/influxdb/)
277320
* [Fuge](https://github.com/apparatus/fuge)

slides/html/index.html

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<section data-markdown><script type="text/template">
22
## Developing Microservices
33
adapted from [_micro-services-iot_](https://github.com/nearform/micro-services-tutorial-iot)
4+
5+
Presented by Wyatt Preul and Lloyd Benson
46
</script></section>
57
<section data-markdown><script type="text/template">
68
### Microservices are...
@@ -41,14 +43,6 @@
4143
* node 4 or newer
4244
</script></section>
4345
<section data-markdown><script type="text/template">
44-
### Setup
45-
```
46-
git clone https://github.com/lloydbenson/microservices-workshop
47-
docker pull tutum/influxdb
48-
docker pull node:6-slim
49-
```
50-
</script></section>
51-
<section data-markdown><script type="text/template">
5246
### Let's build a system...
5347
<img src="/images/target.png">
5448
</script></section>
@@ -66,6 +60,17 @@
6660
* Docker
6761
</script></section>
6862
<section data-markdown><script type="text/template">
63+
### Setup
64+
```
65+
### Get the Workshop
66+
git clone https://github.com/lloydbenson/microservices-workshop
67+
docker pull tutum/influxdb
68+
docker pull node:4
69+
docker-compose
70+
71+
```
72+
</script></section>
73+
<section data-markdown><script type="text/template">
6974
### You should now have
7075
```
7176
## should execute and show nothing running
@@ -75,12 +80,6 @@
7580
```
7681
</script></section>
7782
<section data-markdown><script type="text/template">
78-
### Get the Workshop
79-
```
80-
git clone https://github.com/lloydbenson/microservices
81-
```
82-
</script></section>
83-
<section data-markdown><script type="text/template">
8483
### Build the Frontend
8584
* _README.md_
8685
* `npm install`
@@ -90,6 +89,7 @@
9089
</script></section>
9190
<section data-markdown><script type="text/template">
9291
### Challenge 1
92+
Objective: Start up the InfluxDB and login into the web interface
9393
* start up the database
9494
* browse the influx web interface
9595
* hint: [https://hub.docker.com/r/tutum/influxdb]()
@@ -99,11 +99,6 @@
9999
```
100100
docker run -d -p 8083:8083 -p 8086:8086 tutum/influxdb
101101
step1/services/influx/run.sh
102-
docker-machine ip default
103-
docker ps -a | grep 'tutum/influxdb'
104-
| awk '{print $1}' | xargs docker inspect
105-
--format '\{{ .NetworkSettings.IPAddress }}'
106-
107102
[http://localhost:8083]() (influx console)
108103
```
109104
</script></section>
@@ -113,6 +108,7 @@
113108
</script></section>
114109
<section data-markdown><script type="text/template">
115110
### Challenge 2
111+
Objective: Start the serializer and start sending data to influx
116112
* script start of challenge2/services/serializer
117113
* send data via curl
118114
* check that data was written by using the influx browser
@@ -138,6 +134,7 @@
138134
</script></section>
139135
<section data-markdown><script type="text/template">
140136
### Challenge 3
137+
Objective: Add serializer service and send test data
141138
* make script to start challenge3/frontend
142139
* start up influxDB frontend and serializer
143140
* use testWrite.sh|bat to send data
@@ -158,6 +155,7 @@
158155
</script></section>
159156
<section data-markdown><script type="text/template">
160157
### Challenge 4
158+
Objective: Use fuge to manage your containers/processes
161159
* use fuge shell to start it up
162160
* challenge4/fuge (compose-dev.yml and fuge-config.json)
163161
* hint: stop all processes/containers
@@ -179,6 +177,7 @@
179177
</script></section>
180178
<section data-markdown><script type="text/template">
181179
### Challenge 5
180+
Objective: Add sensor and broker
182181
* add sensor and broker to fuge yml file
183182
* hint: challenge5/services/(broker|sensor)
184183
</script></section>
@@ -196,6 +195,7 @@
196195
</script></section>
197196
<section data-markdown><script type="text/template">
198197
### Challenge 6
198+
Objective: Add actuator
199199
* add actuator to compose-dev.yml
200200
* actuator provides an offset
201201
* hint: challenge6/services/acuator
@@ -211,6 +211,7 @@
211211
</script></section>
212212
<section data-markdown><script type="text/template">
213213
### Challenge 7
214+
Objective: utilize tail in fuge
214215
* limit default tail to false in fuge-config.js
215216
* fuge shell and start all
216217
* tail serializer
@@ -227,6 +228,7 @@
227228
</script></section>
228229
<section data-markdown><script type="text/template">
229230
### Challenge 8
231+
Objective: use docker-compose
230232
* use traditional docker-compose instead to show its compatibility
231233
* hint: [https://docs.docker.com/compose]()
232234
</script></section>
@@ -237,6 +239,40 @@
237239
* http://localhost:10001 to verify everything
238240
</script></section>
239241
<section data-markdown><script type="text/template">
242+
### Challenge 9
243+
Objective: Utilize an environment file
244+
* Add an environment file
245+
* hint: [https://docs.docker.com/compose/compose-file/]().
246+
</script></section>
247+
<section data-markdown><script type="text/template">
248+
### Solution to Challenge 9
249+
* env_file: ./dev.conf
250+
</script></section>
251+
<section data-markdown><script type="text/template">
252+
### Challenge 10
253+
Objective: Keep a persistent database
254+
* A local data directory is already created for you.
255+
* hint: [https://docs.docker.com/compose/compose-file/]().
256+
</script></section>
257+
<section data-markdown><script type="text/template">
258+
### Solution to Challenge 10
259+
* volumes:
260+
- "./data:/data"
261+
</script></section>
262+
<section data-markdown><script type="text/template">
263+
### Challenge 11
264+
Objective: ??
265+
* something
266+
</script></section>
267+
<section data-markdown><script type="text/template">
268+
### Solution to Challenge 11
269+
* solution
270+
</script></section>
271+
<section data-markdown><script type="text/template">
272+
### Challenge 12
273+
* ALL DONE! What more should we do!?!?
274+
</script></section>
275+
<section data-markdown><script type="text/template">
240276
### Resources
241277
* [InfluxDB Docker](https://hub.docker.com/r/tutum/influxdb/)
242278
* [Fuge](https://github.com/apparatus/fuge)
@@ -245,4 +281,4 @@
245281
<section data-markdown><script type="text/template">
246282
### Questions?
247283

248-
</script></section>
284+
</script></section>

0 commit comments

Comments
 (0)