Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix config dir name"
[ccsdk/distribution.git]
/
src
/
main
/
yaml
/
docker-compose.yml
diff --git
a/src/main/yaml/docker-compose.yml
b/src/main/yaml/docker-compose.yml
index
bd66b05
..
4e0be9e
100644
(file)
--- a/
src/main/yaml/docker-compose.yml
+++ b/
src/main/yaml/docker-compose.yml
@@
-17,15
+17,11
@@
services:
bareodl:
bareodl:
- image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odl-image:0.
1
-STAGING-latest
+ image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odl-image:0.
2
-STAGING-latest
container_name: ccsdk_bareodl_container
entrypoint: ["/opt/opendaylight/current/bin/karaf"]
ports:
- "18181:8181"
container_name: ccsdk_bareodl_container
entrypoint: ["/opt/opendaylight/current/bin/karaf"]
ports:
- "18181:8181"
- links:
- - db:dbhost
- - db:sdnctldb01
- - db:sdnctldb02
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
@@
-36,13
+32,13
@@
services:
max-file: "5"
odlsli:
max-file: "5"
odlsli:
- image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-image:0.
1
-STAGING-latest
+ image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-image:0.
2
-STAGING-latest
depends_on :
- db
container_name: ccsdk_odlsli_container
entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
ports:
depends_on :
- db
container_name: ccsdk_odlsli_container
entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
ports:
- - "8
282
:8181"
+ - "8
383
:8181"
links:
- db:dbhost
- db:sdnctldb01
links:
- db:dbhost
- db:sdnctldb01
@@
-57,7
+53,7
@@
services:
max-file: "5"
dgbuilder:
max-file: "5"
dgbuilder:
- image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:0.
1
-STAGING-latest
+ image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:0.
2
-STAGING-latest
depends_on:
- db
container_name: ccsdk_dgbuilder_container
depends_on:
- db
container_name: ccsdk_dgbuilder_container