diff options
author | 2020-05-05 11:11:54 +0100 | |
---|---|---|
committer | 2020-05-06 10:29:59 +0000 | |
commit | 27564b747db964cea07fe94d855ecedce6d6326d (patch) | |
tree | 3bf96133848f062c7904ce00aa3090173100d5f9 | |
parent | 43e7a9e755d089379074331cd2034d68b02dbca8 (diff) |
Adjust docker-compose and SSL config
SSL is disabled by default as it is documented in the README.
Expose a port for cassandra docker.
Fix sdc-workflow-backend SDC_ENDPOINT environment variable.
Add some build artifacts to gitignore.
Issue-ID: SDC-3020
Change-Id: If4d81752f6b7c2c1ec2a73327bebbb8ef3ce0420
Signed-off-by: andre.schmid <andre.schmid@est.tech>
-rw-r--r-- | docker-compose/.env | 7 | ||||
-rw-r--r-- | docker-compose/cassandra.yml | 3 | ||||
-rw-r--r-- | docker-compose/docker-compose.yml | 2 | ||||
-rw-r--r-- | sdc-workflow-bdd/.gitignore | 2 | ||||
-rw-r--r-- | sdc-workflow-designer-be/.gitignore | 1 | ||||
-rw-r--r-- | sdc-workflow-designer-be/docker/startup.sh | 3 | ||||
-rw-r--r-- | sdc-workflow-designer-be/src/main/resources/application.properties | 2 |
7 files changed, 15 insertions, 5 deletions
diff --git a/docker-compose/.env b/docker-compose/.env index 58f6cb30..0268cd62 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -1,4 +1,5 @@ -IMAGE_TAG=latest +#IMAGE_TAG=latest +# If you want to use your local build, leave the value empty REGISTRY= REGISTRY=nexus3.onap.org:10001/ 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 @@ -19,4 +20,6 @@ SDC_PROTOCOL=HTTP SDC_USER=workflow SDC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U FRONTEND_PORT=8184 -FRONTEND_DEBUG_PORT=7000
\ No newline at end of file +FRONTEND_DEBUG_PORT=7000 +# To enable HTTPS +#SERVER_SSL_ENABLED=true
\ No newline at end of file diff --git a/docker-compose/cassandra.yml b/docker-compose/cassandra.yml index 28d681e7..86b57233 100644 --- a/docker-compose/cassandra.yml +++ b/docker-compose/cassandra.yml @@ -1,5 +1,6 @@ version: '3' services: - cassandra: image: "cassandra:3.11.4" + ports: + - "9042:9042" diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index b2250ce0..41e6e453 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -21,7 +21,7 @@ services: - CS_PASSWORD - CS_PORT=${CASSANDRA_PORT} - SDC_PROTOCOL - - SDC_ENDPOINT="${SDC_HOST}:8080" + - SDC_ENDPOINT=${SDC_HOST}:8080 - SDC_USER - SDC_PASSWORD diff --git a/sdc-workflow-bdd/.gitignore b/sdc-workflow-bdd/.gitignore index 316e3984..8919ee4e 100644 --- a/sdc-workflow-bdd/.gitignore +++ b/sdc-workflow-bdd/.gitignore @@ -5,7 +5,9 @@ debug.log dist docs node_modules +node .npmrc npm-debug.log devConfig.json jenkinsConfig.json +/yarn.lock diff --git a/sdc-workflow-designer-be/.gitignore b/sdc-workflow-designer-be/.gitignore new file mode 100644 index 00000000..d2d0c630 --- /dev/null +++ b/sdc-workflow-designer-be/.gitignore @@ -0,0 +1 @@ +/docker/*.jar diff --git a/sdc-workflow-designer-be/docker/startup.sh b/sdc-workflow-designer-be/docker/startup.sh index bc1d6463..cda039ab 100644 --- a/sdc-workflow-designer-be/docker/startup.sh +++ b/sdc-workflow-designer-be/docker/startup.sh @@ -3,6 +3,7 @@ HTTPS_ENABLED=${SERVER_SSL_ENABLED:-"false"} if [ "$HTTPS_ENABLED" = "true" ] then + echo "HTTPS is enabled. Configuring keystore." KEYSTORE=${SERVER_SSL_KEYSTORE_PATH} if [ -f "$KEYSTORE" ]; then echo "$KEYSTORE exist" @@ -24,5 +25,7 @@ then cp /truststore $TRUSTSTORE_DIR chmod 755 $TRUSTSTORE fi +else + echo "HTTPS is disabled." fi java ${JAVA_OPTIONS} -jar /app.jar ${SPRING_BOOT_OPTIONS}
\ No newline at end of file diff --git a/sdc-workflow-designer-be/src/main/resources/application.properties b/sdc-workflow-designer-be/src/main/resources/application.properties index 7dcc2c4b..d64d7a9f 100644 --- a/sdc-workflow-designer-be/src/main/resources/application.properties +++ b/sdc-workflow-designer-be/src/main/resources/application.properties @@ -17,7 +17,7 @@ server.servlet.context-path=/ http.port=${HTTP_PORT:8080} server.port=${SERVER_PORT:8443} -server.ssl.enabled=${SERVER_SSL_ENABLED:true} +server.ssl.enabled=${SERVER_SSL_ENABLED:false} server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:} server.ssl.key-store-password=${SERVER_SSL_KEY_PASSWORD:} server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:} |