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

Commit 839a27f

Browse files
authored
Merge branch 'master' into fix/kong-db-password
2 parents b8e85d8 + bca2881 commit 839a27f

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

releases/nightly-build/compose-files/docker-compose-nexus-no-secty-arm64.yml renamed to releases/nightly-build/compose-files/docker-compose-nexus-mongo-no-secty-arm64.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# /*******************************************************************************
2-
# * Copyright 2018 Dell Inc.
2+
# * Copyright 2020 Redis Labs Inc.
33
# *
44
# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# * in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,13 @@
1212
# * the License.
1313
# *
1414
# * @author: Jim White, Dell
15-
# * EdgeX Foundry, Fuji, version master
16-
# * added: Jun 30, 2019
15+
# * @author: Andre Srinivasan, Redis Labs
16+
# * EdgeX Foundry, Geneva, version 1.2.0
17+
# * added: Feb 2020
1718
# *******************************************************************************/
1819

19-
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway and Secret Store
20+
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway
21+
# and Secret Store
2022

2123
version: '3.4'
2224

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# /*******************************************************************************
2-
# * Copyright 2018 Dell Inc.
2+
# * Copyright 2020 Redis Labs Inc.
33
# *
44
# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# * in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,13 @@
1212
# * the License.
1313
# *
1414
# * @author: Jim White, Dell
15-
# * EdgeX Foundry, Fuji, version master
16-
# * added: Jun 30, 2019
15+
# * @author: Andre Srinivasan, Redis Labs
16+
# * EdgeX Foundry, Geneva, version 1.2.0
17+
# * added: Feb 2020
1718
# *******************************************************************************/
1819

19-
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway and Secret Store
20+
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway
21+
# and Secret Store
2022

2123
version: '3.4'
2224

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# /*******************************************************************************
2-
# * Copyright 2018 Dell Inc.
2+
# * Copyright 2020 Redis Labs Inc.
33
# *
44
# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# * in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,13 @@
1212
# * the License.
1313
# *
1414
# * @author: Jim White, Dell
15-
# * EdgeX Foundry, Fuji, version master
16-
# * added: Jun 30, 2019
15+
# * @author: Andre Srinivasan, Redis Labs
16+
# * EdgeX Foundry, Geneva, version 1.2.0
17+
# * added: Feb 2020
1718
# *******************************************************************************/
1819

19-
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway and Secret Store
20+
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway
21+
# and Secret Store
2022

2123
version: '3.4'
2224

@@ -83,7 +85,7 @@ services:
8385
- consul
8486

8587
redis:
86-
image: arm64v8/redis:5.0.5-alpine
88+
image: arm64v8/redis:5.0.7-alpine
8789
ports:
8890
- "6379:6379"
8991
container_name: edgex-redis

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# /*******************************************************************************
2-
# * Copyright 2018 Dell Inc.
2+
# * Copyright 2020 Redis Labs Inc.
33
# *
44
# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# * in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,13 @@
1212
# * the License.
1313
# *
1414
# * @author: Jim White, Dell
15-
# * EdgeX Foundry, Fuji, version master
16-
# * added: Jun 30, 2019
15+
# * @author: Andre Srinivasan, Redis Labs
16+
# * EdgeX Foundry, Geneva, version 1.2.0
17+
# * added: Feb 2020
1718
# *******************************************************************************/
1819

19-
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway and Secret Store
20+
# NOTE: this Docker Compose file does not contain the security services - namely the API Gateway
21+
# and Secret Store
2022

2123
version: '3.4'
2224

@@ -83,7 +85,7 @@ services:
8385
- consul
8486

8587
redis:
86-
image: redis:5.0.5-alpine
88+
image: redis:5.0.7-alpine
8789
ports:
8890
- "6379:6379"
8991
container_name: edgex-redis

0 commit comments

Comments
 (0)