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

Commit 345256a

Browse files
bnevis-ibnevis-i
authored
Merge branch 'master' into issue-193
2 parents 78c44e3 + 8733740 commit 345256a

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

‎releases/fuji/compose-files/docker-compose-fuji-no-secty.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ services:
314314
#################################################################
315315

316316
device-virtual:
317-
image: edgexfoundry/docker-device-virtual-go:1.1.0
317+
image: edgexfoundry/docker-device-virtual-go:1.1.1
318318
ports:
319319
- "49990:49990"
320320
container_name: edgex-device-virtual
@@ -333,7 +333,7 @@ services:
333333
- command
334334

335335
# device-random:
336-
# image: edgexfoundry/docker-device-random-go:1.1.0
336+
# image: edgexfoundry/docker-device-random-go:1.1.1
337337
# ports:
338338
# - "49988:49988"
339339
# container_name: edgex-device-random
@@ -350,7 +350,7 @@ services:
350350
# - command
351351
#
352352
# device-mqtt:
353-
# image: edgexfoundry/docker-device-mqtt-go:1.1.0
353+
# image: edgexfoundry/docker-device-mqtt-go:1.1.1
354354
# ports:
355355
# - "49982:49982"
356356
# container_name: edgex-device-mqtt
@@ -367,7 +367,7 @@ services:
367367
# - command
368368
#
369369
# device-modbus:
370-
# image: edgexfoundry/docker-device-modbus-go:1.1.0
370+
# image: edgexfoundry/docker-device-modbus-go:1.1.1
371371
# ports:
372372
# - "49991:49991"
373373
# container_name: edgex-device-modbus
@@ -384,7 +384,7 @@ services:
384384
# - command
385385
#
386386
# device-snmp:
387-
# image: edgexfoundry/docker-device-snmp-go:1.1.0
387+
# image: edgexfoundry/docker-device-snmp-go:1.1.1
388388
# ports:
389389
# - "49993:49993"
390390
# container_name: edgex-device-snmp

‎releases/fuji/compose-files/docker-compose-fuji.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ services:
458458
#################################################################
459459

460460
device-virtual:
461-
image: edgexfoundry/docker-device-virtual-go:1.1.0
461+
image: edgexfoundry/docker-device-virtual-go:1.1.1
462462
ports:
463463
- "49990:49990"
464464
container_name: edgex-device-virtual
@@ -477,7 +477,7 @@ services:
477477
- command
478478

479479
# device-random:
480-
# image: edgexfoundry/docker-device-random-go:1.1.0
480+
# image: edgexfoundry/docker-device-random-go:1.1.1
481481
# ports:
482482
# - "49988:49988"
483483
# container_name: edgex-device-random
@@ -494,7 +494,7 @@ services:
494494
# - command
495495
#
496496
# device-mqtt:
497-
# image: edgexfoundry/docker-device-mqtt-go:1.1.0
497+
# image: edgexfoundry/docker-device-mqtt-go:1.1.1
498498
# ports:
499499
# - "49982:49982"
500500
# container_name: edgex-device-mqtt
@@ -511,7 +511,7 @@ services:
511511
# - command
512512
#
513513
# device-modbus:
514-
# image: edgexfoundry/docker-device-modbus-go:1.1.0
514+
# image: edgexfoundry/docker-device-modbus-go:1.1.1
515515
# ports:
516516
# - "49991:49991"
517517
# container_name: edgex-device-modbus
@@ -528,7 +528,7 @@ services:
528528
# - command
529529
#
530530
# device-snmp:
531-
# image: edgexfoundry/docker-device-snmp-go:1.1.0
531+
# image: edgexfoundry/docker-device-snmp-go:1.1.1
532532
# ports:
533533
# - "49993:49993"
534534
# container_name: edgex-device-snmp

‎releases/fuji/compose-files/docker-compose-redis-fuji-no-secty.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ services:
305305
#################################################################
306306

307307
device-virtual:
308-
image: edgexfoundry/docker-device-virtual-go:1.1.0
308+
image: edgexfoundry/docker-device-virtual-go:1.1.1
309309
ports:
310310
- "49990:49990"
311311
container_name: edgex-device-virtual
@@ -324,7 +324,7 @@ services:
324324
- command
325325

326326
# device-random:
327-
# image: edgexfoundry/docker-device-random-go:1.1.0
327+
# image: edgexfoundry/docker-device-random-go:1.1.1
328328
# ports:
329329
# - "49988:49988"
330330
# container_name: edgex-device-random
@@ -341,7 +341,7 @@ services:
341341
# - command
342342
#
343343
# device-mqtt:
344-
# image: edgexfoundry/docker-device-mqtt-go:1.1.0
344+
# image: edgexfoundry/docker-device-mqtt-go:1.1.1
345345
# ports:
346346
# - "49982:49982"
347347
# container_name: edgex-device-mqtt
@@ -358,7 +358,7 @@ services:
358358
# - command
359359
#
360360
# device-modbus:
361-
# image: edgexfoundry/docker-device-modbus-go:1.1.0
361+
# image: edgexfoundry/docker-device-modbus-go:1.1.1
362362
# ports:
363363
# - "49991:49991"
364364
# container_name: edgex-device-modbus
@@ -375,7 +375,7 @@ services:
375375
# - command
376376
#
377377
# device-snmp:
378-
# image: edgexfoundry/docker-device-snmp-go:1.1.0
378+
# image: edgexfoundry/docker-device-snmp-go:1.1.1
379379
# ports:
380380
# - "49993:49993"
381381
# container_name: edgex-device-snmp

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- consul-data:/consul/data:z
5353

5454
consul:
55-
image: nexus3.edgexfoundry.org:10001/arm64v8/consul:1.3.1
55+
image: nexus3.edgexfoundry.org:10004/docker-edgex-consul-arm64:master
5656
ports:
5757
- "8400:8400"
5858
- "8500:8500"
@@ -91,7 +91,7 @@ services:
9191
- consul
9292

9393
vault:
94-
image: vault:1.0.3
94+
image: vault:1.3.1
9595
container_name: edgex-vault
9696
hostname: edgex-vault
9797
networks:
@@ -144,8 +144,7 @@ services:
144144
volumes:
145145
- vault-config:/vault/config:z
146146
- consul-scripts:/consul/scripts:ro,z
147-
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
148-
- /tmp/edgex/secrets/edgex-kong:/tmp/edgex/secrets/edgex-kong:ro,z
147+
- /tmp/edgex/secrets:/tmp/edgex/secrets:z
149148
depends_on:
150149
- volume
151150
- consul
@@ -206,6 +205,7 @@ services:
206205
- "8001:8001"
207206
- "8443:8443"
208207
- "8444:8444"
208+
tty: true
209209
environment:
210210
- 'KONG_DATABASE=postgres'
211211
- 'KONG_PG_HOST=kong-db'
@@ -244,10 +244,9 @@ services:
244244
- vault-config:/vault/config:z
245245
- consul-scripts:/consul/scripts:ro,z
246246
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
247-
- /tmp/edgex/secrets/edgex-kong:/tmp/edgex/secrets/edgex-kong:ro,z
247+
- /tmp/edgex/secrets/edgex-security-proxy-setup:/tmp/edgex/secrets/edgex-security-proxy-setup:ro,z
248248
depends_on:
249-
- vault
250-
- kong-db
249+
- vault-worker
251250
- kong
252251

253252
# end of containers for reverse proxy

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ services:
9191
- consul
9292

9393
vault:
94-
image: vault:1.0.3
94+
image: vault:1.3.1
9595
container_name: edgex-vault
9696
hostname: edgex-vault
9797
networks:
@@ -205,6 +205,7 @@ services:
205205
- "8001:8001"
206206
- "8443:8443"
207207
- "8444:8444"
208+
tty: true
208209
environment:
209210
- 'KONG_DATABASE=postgres'
210211
- 'KONG_PG_HOST=kong-db'
@@ -243,10 +244,9 @@ services:
243244
- vault-config:/vault/config:z
244245
- consul-scripts:/consul/scripts:ro,z
245246
- /tmp/edgex/secrets/ca:/tmp/edgex/secrets/ca:ro,z
246-
- /tmp/edgex/secrets/edgex-kong:/tmp/edgex/secrets/edgex-kong:ro,z
247+
- /tmp/edgex/secrets/edgex-security-proxy-setup:/tmp/edgex/secrets/edgex-security-proxy-setup:ro,z
247248
depends_on:
248-
- vault
249-
- kong-db
249+
- vault-worker
250250
- kong
251251

252252
# end of containers for reverse proxy

0 commit comments

Comments
 (0)