diff options
author | priyanshu <pagarwal@amdocs.com> | 2018-05-28 15:29:26 +0300 |
---|---|---|
committer | Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2018-05-29 08:59:17 +0000 |
commit | daf0dfe8308a259d168734d3fe98212cadad1a9e (patch) | |
tree | 921c28edbda67f876fd88935f0a50fec6eb98e11 /services/activity-spec/activity-spec-web/activity-spec-docker-assembly | |
parent | 80a35922da9c0244e736a87fea3007de92822967 (diff) |
Activity Spec docker enhancements
Activity Spec Changes for docker in Kubernetes
Change-Id: I987fe097792ccd5d41a0ad811602dad72259d45f
Issue-ID: SDC-1048
Signed-off-by: priyanshu <pagarwal@amdocs.com>
Diffstat (limited to 'services/activity-spec/activity-spec-web/activity-spec-docker-assembly')
4 files changed, 59 insertions, 0 deletions
diff --git a/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/Dockerfile b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/Dockerfile new file mode 100644 index 0000000000..adbde5e441 --- /dev/null +++ b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/Dockerfile @@ -0,0 +1,24 @@ +FROM jetty:9.4.9-alpine + +EXPOSE 8080 +EXPOSE 8443 +EXPOSE 5005 + +USER root + +RUN mkdir -p /etc/onap/activity-spec/be +RUN mkdir -p /var/log/ONAP/activity-spec/be + +ENV CONFIG_FILES_DIR /etc/onap/activity-spec/be +ENV LOGS_DIR /var/log/ONAP/activity-spec/be + +ADD activity-spec-api-docs-*.war ${JETTY_BASE}/webapps/ +ADD activity-spec-war-*.war ${JETTY_BASE}/webapps/ + +COPY start.sh . +COPY logback.xml ${CONFIG_FILES_DIR} + +RUN chown -R jetty:jetty ${JETTY_BASE}/webapps +RUN chmod 744 start.sh + +ENTRYPOINT [ "./start.sh" ]
\ No newline at end of file diff --git a/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/Activity_Spec_Manual_Steps_And_Commands.txt b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/Activity_Spec_Manual_Steps_And_Commands.txt new file mode 100644 index 0000000000..c724498349 --- /dev/null +++ b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/Activity_Spec_Manual_Steps_And_Commands.txt @@ -0,0 +1,14 @@ +# Steps to run activiti-spec docker + +1. Create a directory on host machine to hold configuration file. +2. Copy the provided configuration.yaml in this new;y created directory and populate real enviornment value of Cassandra to which activity-spec web service needs to be connected. +3. Execute below commands to start docker containers. + +# 1. Start activity-spec container +docker run -d --name <CONTAINER_NAME> -e JAVA_OPTIONS="-Xmx128m -Xms128m -Xss1m" -v <CONFIG_FILE_DIRECTORY_PATH>:/etc/onap/activity-spec/be/config -p <PORT_TO_HOST_SERVICE>:8080 <IMAGE_NAME> +# 2. Start activity-spec-init container +docker run -d --name <CONTAINER_NAME> -e CS_HOST=<CS_HOST_IP> -e CS_PORT=<CS_PORT> -e CS_USER=<CS_USER> -e CS_PASSWORD=<CS_PASSWORD> <IMAGE_NAME> + +# Example Commands +docker run -d --name sdc-act -e JAVA_OPTIONS="-Xmx128m -Xms128m -Xss1m" -v /data/environments:/etc/onap/activity-spec/be/config -p 8090:8080 onap/activity-spec:1.2.0-SNAPSHOT +docker run -d --name sdc-act-init -e CS_HOST=172.17.0.2 -e CS_USER=asdc_user -e CS_PORT=9160 -e CS_PASSWORD=Aa1234%^! onap/activity-spec-init:1.2.0-SNAPSHOT diff --git a/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/configuration.yaml b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/configuration.yaml new file mode 100644 index 0000000000..bedf36c5db --- /dev/null +++ b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/ReadMe/configuration.yaml @@ -0,0 +1,11 @@ +cassandraConfig: + cassandraHosts: ['${CS_HOST}'] + reconnectTimeout : 30000 + socketReadTimeout: 20000 + socketConnectTimeout: 20000 + authenticate: true + username: ${CS_USER} + password: ${CS_PASSWORD} + ssl: ${CS_SSL_ENABLED} + truststorePath : ${CS_TRUST_PATH} + truststorePassword : ${CS_TRUST_PASSWORD}
\ No newline at end of file diff --git a/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/start.sh b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/start.sh new file mode 100644 index 0000000000..993ace67bf --- /dev/null +++ b/services/activity-spec/activity-spec-web/activity-spec-docker-assembly/start.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +JAVA_OPTIONS=" ${JAVA_OPTIONS} \ + -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 + -Dconfig.home=${CONFIG_FILES_DIR}/config \ + -Dlog.home=${LOGS_DIR} \ + -Dlogback.configurationFile=${CONFIG_FILES_DIR}/logback.xml \ + -Dconfiguration.yaml=${CONFIG_FILES_DIR}/config/configuration.yaml" + +java -jar "$JETTY_HOME/start.jar" ${JAVA_OPTIONS}
\ No newline at end of file |