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

Commit 3b15320

Browse files
authored
Merge branch 'master' into issue-193
2 parents 4be47d4 + 1b17330 commit 3b15320

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ services:
141141
edgex-network:
142142
aliases:
143143
- edgex-vault-worker
144+
tmpfs:
145+
- /run
144146
volumes:
145147
- vault-config:/vault/config:z
146148
- consul-scripts:/consul/scripts:ro,z
@@ -241,7 +243,6 @@ services:
241243
aliases:
242244
- edgex-proxy
243245
volumes:
244-
- vault-config:/vault/config:z
245246
- consul-scripts:/consul/scripts:ro,z
246247
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
247248
- /tmp/edgex/secrets/edgex-security-proxy-setup:/tmp/edgex/secrets/edgex-security-proxy-setup:ro,z
@@ -264,7 +265,6 @@ services:
264265
networks:
265266
- edgex-network
266267
volumes:
267-
- vault-config:/vault/config:z
268268
- consul-scripts:/consul/scripts:ro,z
269269
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
270270
- /tmp/edgex/secrets/edgex-mongo:/tmp/edgex/secrets/edgex-mongo:ro,z
@@ -282,7 +282,6 @@ services:
282282
- edgex-network
283283
volumes:
284284
- log-data:/edgex/logs:z
285-
- vault-config:/vault/config:z
286285
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
287286
- /tmp/edgex/secrets/edgex-support-logging:/tmp/edgex/secrets/edgex-support-logging:ro,z
288287
depends_on:
@@ -312,7 +311,6 @@ services:
312311
networks:
313312
- edgex-network
314313
volumes:
315-
- vault-config:/vault/config:z
316314
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
317315
- /tmp/edgex/secrets/edgex-support-notifications:/tmp/edgex/secrets/edgex-support-notifications:ro,z
318316
depends_on:
@@ -327,7 +325,6 @@ services:
327325
networks:
328326
- edgex-network
329327
volumes:
330-
- vault-config:/vault/config:z
331328
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
332329
- /tmp/edgex/secrets/edgex-core-metadata:/tmp/edgex/secrets/edgex-core-metadata:ro,z
333330
depends_on:
@@ -343,7 +340,6 @@ services:
343340
networks:
344341
- edgex-network
345342
volumes:
346-
- vault-config:/vault/config:z
347343
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
348344
- /tmp/edgex/secrets/edgex-core-data:/tmp/edgex/secrets/edgex-core-data:ro,z
349345
depends_on:
@@ -358,7 +354,6 @@ services:
358354
networks:
359355
- edgex-network
360356
volumes:
361-
- vault-config:/vault/config:z
362357
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
363358
- /tmp/edgex/secrets/edgex-core-command:/tmp/edgex/secrets/edgex-core-command:ro,z
364359
depends_on:
@@ -373,7 +368,6 @@ services:
373368
networks:
374369
- edgex-network
375370
volumes:
376-
- vault-config:/vault/config:z
377371
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
378372
- /tmp/edgex/secrets/edgex-support-scheduler:/tmp/edgex/secrets/edgex-support-scheduler:ro,z
379373
depends_on:

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ services:
141141
edgex-network:
142142
aliases:
143143
- edgex-vault-worker
144+
tmpfs:
145+
- /run
144146
volumes:
145147
- vault-config:/vault/config:z
146148
- consul-scripts:/consul/scripts:ro,z
@@ -241,7 +243,6 @@ services:
241243
aliases:
242244
- edgex-proxy
243245
volumes:
244-
- vault-config:/vault/config:z
245246
- consul-scripts:/consul/scripts:ro,z
246247
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
247248
- /tmp/edgex/secrets/edgex-security-proxy-setup:/tmp/edgex/secrets/edgex-security-proxy-setup:ro,z
@@ -264,7 +265,6 @@ services:
264265
networks:
265266
- edgex-network
266267
volumes:
267-
- vault-config:/vault/config:z
268268
- consul-scripts:/consul/scripts:ro,z
269269
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
270270
- /tmp/edgex/secrets/edgex-mongo:/tmp/edgex/secrets/edgex-mongo:ro,z
@@ -282,7 +282,6 @@ services:
282282
- edgex-network
283283
volumes:
284284
- log-data:/edgex/logs:z
285-
- vault-config:/vault/config:z
286285
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
287286
- /tmp/edgex/secrets/edgex-support-logging:/tmp/edgex/secrets/edgex-support-logging:ro,z
288287
depends_on:
@@ -312,7 +311,6 @@ services:
312311
networks:
313312
- edgex-network
314313
volumes:
315-
- vault-config:/vault/config:z
316314
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
317315
- /tmp/edgex/secrets/edgex-support-notifications:/tmp/edgex/secrets/edgex-support-notifications:ro,z
318316
depends_on:
@@ -327,7 +325,6 @@ services:
327325
networks:
328326
- edgex-network
329327
volumes:
330-
- vault-config:/vault/config:z
331328
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
332329
- /tmp/edgex/secrets/edgex-core-metadata:/tmp/edgex/secrets/edgex-core-metadata:ro,z
333330
depends_on:
@@ -343,7 +340,6 @@ services:
343340
networks:
344341
- edgex-network
345342
volumes:
346-
- vault-config:/vault/config:z
347343
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
348344
- /tmp/edgex/secrets/edgex-core-data:/tmp/edgex/secrets/edgex-core-data:ro,z
349345
depends_on:
@@ -358,7 +354,6 @@ services:
358354
networks:
359355
- edgex-network
360356
volumes:
361-
- vault-config:/vault/config:z
362357
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
363358
- /tmp/edgex/secrets/edgex-core-command:/tmp/edgex/secrets/edgex-core-command:ro,z
364359
depends_on:
@@ -373,7 +368,6 @@ services:
373368
networks:
374369
- edgex-network
375370
volumes:
376-
- vault-config:/vault/config:z
377371
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
378372
- /tmp/edgex/secrets/edgex-support-scheduler:/tmp/edgex/secrets/edgex-support-scheduler:ro,z
379373
depends_on:

0 commit comments

Comments
 (0)