Skip to content
This repository was archived by the owner on Feb 24, 2021. It is now read-only.

Commit 84d51f3

Browse files
rsdmikemichaelestrin
authored andcommitted
build: streamline docker-compose files for nightly (#164)
Signed-off-by: Mike Johanson <[email protected]>
1 parent f3d1e49 commit 84d51f3

File tree

3 files changed

+1
-160
lines changed

3 files changed

+1
-160
lines changed

releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ services:
5959
aliases:
6060
- edgex-core-consul
6161
volumes:
62-
- db-data:/data/db
63-
- log-data:/edgex/logs
6462
- consul-config:/consul/config
6563
- consul-data:/consul/data
6664
depends_on:
@@ -77,10 +75,7 @@ services:
7775
environment:
7876
<<: *common-variables
7977
volumes:
80-
- db-data:/data/db
8178
- log-data:/edgex/logs
82-
- consul-config:/consul/config
83-
- consul-data:/consul/data
8479
depends_on:
8580
- volume
8681
- consul
@@ -97,9 +92,6 @@ services:
9792
<<: *common-variables
9893
volumes:
9994
- db-data:/data/db
100-
- log-data:/edgex/logs
101-
- consul-config:/consul/config
102-
- consul-data:/consul/data
10395
depends_on:
10496
- volume
10597

@@ -114,10 +106,7 @@ services:
114106
environment:
115107
<<: *common-variables
116108
volumes:
117-
- db-data:/data/db
118109
- log-data:/edgex/logs
119-
- consul-config:/consul/config
120-
- consul-data:/consul/data
121110
depends_on:
122111
- config-seed
123112
- mongo
@@ -134,10 +123,6 @@ services:
134123
environment:
135124
<<: *common-variables
136125
volumes:
137-
- db-data:/data/db
138-
- log-data:/edgex/logs
139-
- consul-config:/consul/config
140-
- consul-data:/consul/data
141126
- /var/run/docker.sock:/var/run/docker.sock
142127
depends_on:
143128
- logging
@@ -152,11 +137,6 @@ services:
152137
- edgex-network
153138
environment:
154139
<<: *common-variables
155-
volumes:
156-
- db-data:/data/db
157-
- log-data:/edgex/logs
158-
- consul-config:/consul/config
159-
- consul-data:/consul/data
160140
depends_on:
161141
- logging
162142

@@ -170,11 +150,6 @@ services:
170150
- edgex-network
171151
environment:
172152
<<: *common-variables
173-
volumes:
174-
- db-data:/data/db
175-
- log-data:/edgex/logs
176-
- consul-config:/consul/config
177-
- consul-data:/consul/data
178153
depends_on:
179154
- logging
180155

@@ -189,11 +164,6 @@ services:
189164
- edgex-network
190165
environment:
191166
<<: *common-variables
192-
volumes:
193-
- db-data:/data/db
194-
- log-data:/edgex/logs
195-
- consul-config:/consul/config
196-
- consul-data:/consul/data
197167
depends_on:
198168
- logging
199169

@@ -207,11 +177,6 @@ services:
207177
- edgex-network
208178
environment:
209179
<<: *common-variables
210-
volumes:
211-
- db-data:/data/db
212-
- log-data:/edgex/logs
213-
- consul-config:/consul/config
214-
- consul-data:/consul/data
215180
depends_on:
216181
- metadata
217182

@@ -225,11 +190,6 @@ services:
225190
- edgex-network
226191
environment:
227192
<<: *common-variables
228-
volumes:
229-
- db-data:/data/db
230-
- log-data:/edgex/logs
231-
- consul-config:/consul/config
232-
- consul-data:/consul/data
233193
depends_on:
234194
- metadata
235195

@@ -253,7 +213,7 @@ services:
253213
- consul
254214
- logging
255215
- data
256-
216+
257217
rulesengine:
258218
image: nexus3.edgexfoundry.org:10004/docker-support-rulesengine:master
259219
ports:
@@ -323,11 +283,6 @@ services:
323283
edgex-network:
324284
aliases:
325285
- edgex-device-virtual
326-
volumes:
327-
- db-data:/data/db
328-
- log-data:/edgex/logs
329-
- consul-config:/consul/config
330-
- consul-data:/consul/data
331286
depends_on:
332287
- data
333288
- command
@@ -341,10 +296,7 @@ services:
341296
# networks:
342297
# - edgex-network
343298
# volumes:
344-
# - db-data:/data/db
345299
# - log-data:/edgex/logs
346-
# - consul-config:/consul/config
347-
# - consul-data:/consul/data
348300
# depends_on:
349301
# - data
350302
# - command
@@ -358,10 +310,7 @@ services:
358310
# networks:
359311
# - edgex-network
360312
# volumes:
361-
# - db-data:/data/db
362313
# - log-data:/edgex/logs
363-
# - consul-config:/consul/config
364-
# - consul-data:/consul/data
365314
# depends_on:
366315
# - data
367316
# - command
@@ -375,10 +324,7 @@ services:
375324
# networks:
376325
# - edgex-network
377326
# volumes:
378-
# - db-data:/data/db
379327
# - log-data:/edgex/logs
380-
# - consul-config:/consul/config
381-
# - consul-data:/consul/data
382328
# depends_on:
383329
# - data
384330
# - command
@@ -392,10 +338,7 @@ services:
392338
# networks:
393339
# - edgex-network
394340
# volumes:
395-
# - db-data:/data/db
396341
# - log-data:/edgex/logs
397-
# - consul-config:/consul/config
398-
# - consul-data:/consul/data
399342
# depends_on:
400343
# - data
401344
# - command
@@ -411,11 +354,6 @@ services:
411354
hostname: edgex-ui-go
412355
networks:
413356
- edgex-network
414-
volumes:
415-
- db-data:/data/db
416-
- log-data:/edgex/logs
417-
- consul-config:/consul/config
418-
- consul-data:/consul/data
419357
depends_on:
420358
- data
421359
- command

releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ services:
7878
<<: *common-variables
7979
volumes:
8080
- log-data:/edgex/logs
81-
- consul-config:/consul/config
82-
- consul-data:/consul/data
8381
depends_on:
8482
- volume
8583
- consul
@@ -109,8 +107,6 @@ services:
109107
<<: *common-variables
110108
volumes:
111109
- log-data:/edgex/logs
112-
- consul-config:/consul/config
113-
- consul-data:/consul/data
114110
depends_on:
115111
- config-seed
116112
- volume
@@ -126,10 +122,6 @@ services:
126122
environment:
127123
<<: *common-variables
128124
volumes:
129-
- db-data:/data/db
130-
- log-data:/edgex/logs
131-
- consul-config:/consul/config
132-
- consul-data:/consul/data
133125
- /var/run/docker.sock:/var/run/docker.sock
134126
depends_on:
135127
- logging
@@ -144,10 +136,6 @@ services:
144136
- edgex-network
145137
environment:
146138
<<: *common-variables
147-
volumes:
148-
- log-data:/edgex/logs
149-
- consul-config:/consul/config
150-
- consul-data:/consul/data
151139
depends_on:
152140
- logging
153141
- redis
@@ -162,10 +150,6 @@ services:
162150
- edgex-network
163151
environment:
164152
<<: *common-variables
165-
volumes:
166-
- log-data:/edgex/logs
167-
- consul-config:/consul/config
168-
- consul-data:/consul/data
169153
depends_on:
170154
- logging
171155
- redis
@@ -181,10 +165,6 @@ services:
181165
- edgex-network
182166
environment:
183167
<<: *common-variables
184-
volumes:
185-
- log-data:/edgex/logs
186-
- consul-config:/consul/config
187-
- consul-data:/consul/data
188168
depends_on:
189169
- logging
190170
- redis
@@ -199,10 +179,6 @@ services:
199179
- edgex-network
200180
environment:
201181
<<: *common-variables
202-
volumes:
203-
- log-data:/edgex/logs
204-
- consul-config:/consul/config
205-
- consul-data:/consul/data
206182
depends_on:
207183
- metadata
208184

@@ -216,10 +192,6 @@ services:
216192
- edgex-network
217193
environment:
218194
<<: *common-variables
219-
volumes:
220-
- log-data:/edgex/logs
221-
- consul-config:/consul/config
222-
- consul-data:/consul/data
223195
depends_on:
224196
- metadata
225197
- redis
@@ -314,11 +286,6 @@ services:
314286
edgex-network:
315287
aliases:
316288
- edgex-device-virtual
317-
volumes:
318-
- db-data:/data/db
319-
- log-data:/edgex/logs
320-
- consul-config:/consul/config
321-
- consul-data:/consul/data
322289
depends_on:
323290
- data
324291
- command
@@ -332,7 +299,6 @@ services:
332299
# networks:
333300
# - edgex-network
334301
# volumes:
335-
# - db-data:/data/db
336302
# - log-data:/edgex/logs
337303
# - consul-config:/consul/config
338304
# - consul-data:/consul/data
@@ -349,7 +315,6 @@ services:
349315
# networks:
350316
# - edgex-network
351317
# volumes:
352-
# - db-data:/data/db
353318
# - log-data:/edgex/logs
354319
# - consul-config:/consul/config
355320
# - consul-data:/consul/data
@@ -366,10 +331,7 @@ services:
366331
# networks:
367332
# - edgex-network
368333
# volumes:
369-
# - db-data:/data/db
370334
# - log-data:/edgex/logs
371-
# - consul-config:/consul/config
372-
# - consul-data:/consul/data
373335
# depends_on:
374336
# - data
375337
# - command
@@ -383,10 +345,7 @@ services:
383345
# networks:
384346
# - edgex-network
385347
# volumes:
386-
# - db-data:/data/db
387348
# - log-data:/edgex/logs
388-
# - consul-config:/consul/config
389-
# - consul-data:/consul/data
390349
# depends_on:
391350
# - data
392351
# - command
@@ -402,11 +361,6 @@ services:
402361
hostname: edgex-ui-go
403362
networks:
404363
- edgex-network
405-
volumes:
406-
- db-data:/data/db
407-
- log-data:/edgex/logs
408-
- consul-config:/consul/config
409-
- consul-data:/consul/data
410364
depends_on:
411365
- data
412366
- command

0 commit comments

Comments
 (0)