diff options
| author |   xuegao <xg353y@intl.att.com> | 2020-10-28 16:29:20 +0100 |
|---|---|---|
| committer |   S�bastien Determe <sebastien.determe@intl.att.com> | 2020-11-05 09:08:17 +0000 |
| commit | be79c612bb8f6200e9e20f14be174f37ff661494 (patch) | |
| tree | efe75f6ee39ac880b5d9f6b9d42a27e3e6cfb763 | |
| parent | 7bd62b8bf58c6c2bee8360ca0cc27533ecbdc3ca (diff) | |
Update docker settingsguilin
Update the docker settings based on the changes done on SDC side.
Issue-ID: SDC-3345
Change-Id: I6a933d34f5f90379f6315e6a54df09e81803bcf3
Signed-off-by: xuegao <xg353y@intl.att.com>
(cherry picked from commit 757d4c2c52895ec95ee82d8223315134b88fc7db)
| -rw-r--r-- | docker-compose/.env | 15 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yml | 25 |
2 files changed, 28 insertions, 12 deletions
diff --git a/docker-compose/.env b/docker-compose/.env index 0268cd62..d6eec702 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -5,13 +5,12 @@ JAVA_OPTIONS=-Xmx1536m -Xms1536m # CS_HOST is set to a dummy string "yyy". This pattern will be used as an identifier to be replaced by the actual # Cassandra hostname or IP address at runtime CS_HOST=yyy -CS_AUTHENTICATE=false -CS_USER= -CS_PASSWORD= +CS_PORT=9042 +CS_SSL_ENABLED=false +CS_AUTHENTICATE=true +CS_USER=asdc_user +CS_PASSWORD=Aa1234%^! -CASSANDRA_INIT_PORT=9160 -CASSANDRA_PORT=9042 -BACKEND_DEBUG_PORT=7001 # SDC_HOST is set to a dummy string "yyy". This pattern will be used as an identifier to be replaced by the actual SDC # hostname or IP address at runtime @@ -19,7 +18,5 @@ SDC_HOST=yyy SDC_PROTOCOL=HTTP SDC_USER=workflow SDC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -FRONTEND_PORT=8184 -FRONTEND_DEBUG_PORT=7000 # To enable HTTPS -#SERVER_SSL_ENABLED=true
\ No newline at end of file +SERVER_SSL_ENABLED=false
\ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 41e6e453..6bfe8c7d 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -8,22 +8,33 @@ services: - CS_AUTHENTICATE - CS_USER - CS_PASSWORD - - CS_PORT=${CASSANDRA_INIT_PORT} + - CS_PORT + networks: + - sdc-network sdc-workflow-backend: depends_on: - sdc-workflow-cassandra-init image: "${REGISTRY}onap/sdc-workflow-backend:${IMAGE_TAG}" + ports: + - "8384:8080" + - "10443:8443" + - "8000:8000" environment: - JAVA_OPTIONS - CS_HOSTS=${CS_HOST} - CS_USER - CS_PASSWORD - - CS_PORT=${CASSANDRA_PORT} + - CS_PORT + - CS_AUTHENTICATE + - CS_SSL_ENABLED - SDC_PROTOCOL - SDC_ENDPOINT=${SDC_HOST}:8080 - SDC_USER - SDC_PASSWORD + - SERVER_SSL_ENABLED + networks: + - sdc-network sdc-workflow-frontend: depends_on: @@ -31,7 +42,15 @@ services: - sdc-workflow-backend image: "${REGISTRY}onap/sdc-workflow-frontend:${IMAGE_TAG}" ports: - - "${FRONTEND_PORT}:8080" + - "8484:8080" + - "11443:8443" environment: - JAVA_OPTIONS - BACKEND=http://sdc-workflow-backend:8080 + networks: + - sdc-network + + +networks: + sdc-network: + external: true
\ No newline at end of file |