Code Review
/
ealt-edge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Https API by APPLCM
[ealt-edge.git]
/
mecm
/
mepm
/
applcm
/
resources
/
test
/
docker-compose.yaml
diff --git
a/mecm/mepm/applcm/resources/test/docker-compose.yaml
b/mecm/mepm/applcm/resources/test/docker-compose.yaml
index
6e585ec
..
4de78db
100644
(file)
--- a/
mecm/mepm/applcm/resources/test/docker-compose.yaml
+++ b/
mecm/mepm/applcm/resources/test/docker-compose.yaml
@@
-9,21
+9,20
@@
volumes:
my-db:
services:
my-db:
services:
- db:
+
mecm
db:
network_mode: bridge
network_mode: bridge
- image:
mysql:5.7
+ image:
postgres:9.6
environment:
environment:
- MYSQL_DATABASE: 'db'
- MYSQL_USER: 'root'
- MYSQL_PASSWORD: 'password'
- # Password for root access
- MYSQL_ROOT_PASSWORD: 'password'
+ POSTGRES_DB: 'mecmdb'
+ POSTGRES_USER: 'root'
+ POSTGRES_PASSWORD: 'password'
+ POSTGRES_ROOT_PASSWORD: 'password'
ports:
ports:
- - '
3306:3306
'
+ - '
5432:5432
'
expose:
expose:
- - '
3306
'
+ - '
5432
'
volumes:
volumes:
- - my-db:/var/lib/
mysql
+ - my-db:/var/lib/
postgresql/data
logging:
driver: "json-file"
options:
logging:
driver: "json-file"
options:
@@
-34,18
+33,19
@@
services:
network_mode: bridge
image: ealtedge/applcm-broker:latest
depends_on:
network_mode: bridge
image: ealtedge/applcm-broker:latest
depends_on:
- - db
+ -
mecm
db
- helm-plugin
links:
- helm-plugin
links:
- -
db:dbhost
+ -
mecmdb:mecmdb
- helm-plugin:helmplugin
restart: always
container_name: applcm-broker
environment:
- helm-plugin:helmplugin
restart: always
container_name: applcm-broker
environment:
- MYSQL_DATABASE: 'db'
- MYSQL_USER: 'root'
- MYSQL_PASSWORD: 'password'
- MYSQL_ROOT_PASSWORD: 'password'
+ POSTGRES_DATABASE: 'mecmdb'
+ DBHOST: 'mecmdb'
+ POSTGRES_USER: 'root'
+ POSTGRES_PASSWORD: 'password'
+ POSTGRES_ROOT_PASSWORD: 'password'
HELM_PLUGIN_PORT: '50051'
KUBERNETES_PLUGIN_PORT: '50052'
LOGFILE_PATH: "/go/release/logfile"
HELM_PLUGIN_PORT: '50051'
KUBERNETES_PLUGIN_PORT: '50052'
LOGFILE_PATH: "/go/release/logfile"
@@
-53,6
+53,8
@@
services:
ADDRESS: "0.0.0.0:8081"
PACKAGE_PATH: "/go/release/application/packages/"
PACKAGE_ARTIFACT_PATH: "/Artifacts/Deployment/"
ADDRESS: "0.0.0.0:8081"
PACKAGE_PATH: "/go/release/application/packages/"
PACKAGE_ARTIFACT_PATH: "/Artifacts/Deployment/"
+ CERTIFICATE_PATH: ""
+ KEY_PATH: ""
ports:
- '28081:8081'
expose:
ports:
- '28081:8081'
expose: