From ed12890b0bb0c07acd3eb7bcbd10bfcca3046a2b Mon Sep 17 00:00:00 2001 From: sheetalm Date: Tue, 13 Mar 2018 19:32:08 +0530 Subject: Activity Spec Service - Dockerization Resolving merge conflict Fixing todo items after rebase. URL to be /activity-spec-api. Removing unused image. Renaming css Configuring docker registry to push images and adding docker profile Add maven docker module to generate below docker images 1 activity-spec-init:1.2.0-SNAPSHOT - creates cassandra keyspace and tables in already running cassandra docker image 2 activity-spec-be:1.2.0-SNAPSHOT - deploys activity spec war and swagger war on base jetty docker image Change-Id: Ic638e2cb9c224e9e6c91cf0f7198594593a77ae5 Issue-ID: SDC-1048 Signed-off-by: sheetalm --- .../activity-spec-init/.maven-dockerignore | 1 + .../activity-spec/activity-spec-init/Dockerfile | 10 +++++ .../activity-spec-init/create_activityspec_db.cql | 13 ++++++ services/activity-spec/activity-spec-init/pom.xml | 47 ++++++++++++++++++++++ services/activity-spec/activity-spec-init/start.sh | 8 ++++ 5 files changed, 79 insertions(+) create mode 100644 services/activity-spec/activity-spec-init/.maven-dockerignore create mode 100644 services/activity-spec/activity-spec-init/Dockerfile create mode 100644 services/activity-spec/activity-spec-init/create_activityspec_db.cql create mode 100644 services/activity-spec/activity-spec-init/pom.xml create mode 100644 services/activity-spec/activity-spec-init/start.sh (limited to 'services/activity-spec/activity-spec-init') diff --git a/services/activity-spec/activity-spec-init/.maven-dockerignore b/services/activity-spec/activity-spec-init/.maven-dockerignore new file mode 100644 index 0000000000..9f970225ad --- /dev/null +++ b/services/activity-spec/activity-spec-init/.maven-dockerignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/services/activity-spec/activity-spec-init/Dockerfile b/services/activity-spec/activity-spec-init/Dockerfile new file mode 100644 index 0000000000..25fcd38411 --- /dev/null +++ b/services/activity-spec/activity-spec-init/Dockerfile @@ -0,0 +1,10 @@ +FROM cassandra:2.1.9 + +ENV CASSANDRA_PORT=9042 + +COPY create_activityspec_db.cql . +COPY start.sh . + +RUN chmod 744 start.sh + +ENTRYPOINT ["/start.sh"] \ No newline at end of file diff --git a/services/activity-spec/activity-spec-init/create_activityspec_db.cql b/services/activity-spec/activity-spec-init/create_activityspec_db.cql new file mode 100644 index 0000000000..2216c33867 --- /dev/null +++ b/services/activity-spec/activity-spec-init/create_activityspec_db.cql @@ -0,0 +1,13 @@ +CREATE KEYSPACE IF NOT EXISTS activity_spec WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }; +USE activity_spec; +CREATE TABLE IF NOT EXISTS unique_value (type text, value text, PRIMARY KEY ((type, value))); +CREATE KEYSPACE IF NOT EXISTS zusammen_activity_spec WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 3 }; +USE zusammen_activity_spec; +CREATE TABLE IF NOT EXISTS item (item_id text primary key, item_info text, creation_time timestamp, modification_time timestamp); +CREATE TABLE IF NOT EXISTS version (space text, item_id text, version_id text,base_version_id text,info text,relations text,creation_time timestamp,modification_time timestamp ,PRIMARY KEY (( space, item_id ), version_id)); +CREATE TABLE IF NOT EXISTS version_elements (space text,item_id text,version_id text,revision_id text,element_ids Map, dirty_element_ids set,stage_element_ids set, conflict_element_ids set, publish_time timestamp,user text,message text, PRIMARY KEY (( space, item_id, version_id ),revision_id)); +CREATE TABLE IF NOT EXISTS element_namespace (item_id text, element_id text, namespace text, PRIMARY KEY ((item_id, element_id))); +CREATE TABLE IF NOT EXISTS element (space text,item_id text,version_id text,element_id text,revision_id text,parent_id text,namespace text,info text,relations text,data blob,searchable_data blob,visualization blob,sub_element_ids set ,element_hash text,PRIMARY KEY (( space, item_id, version_id, element_id ),revision_id)); +CREATE TABLE IF NOT EXISTS element_synchronization_state (space text, item_id text, version_id text, element_id text,revision_id text, publish_time timestamp, dirty boolean, PRIMARY KEY (( space, item_id, version_id ), element_id,revision_id)); +CREATE TABLE IF NOT EXISTS element_stage (space text, item_id text,version_id text, element_id text, parent_id text, namespace text, info text, relations text,data blob, searchable_data blob, visualization blob, sub_element_ids set,element_hash text, publish_time timestamp, action text, conflicted boolean,conflict_dependent_ids set, PRIMARY KEY (( space, item_id, version_id, element_id ))); +CREATE TABLE IF NOT EXISTS version_stage (space text, item_id text, version_id text, base_version_id text, creation_time timestamp,modification_time timestamp, publish_time timestamp, action text, PRIMARY KEY (( space, item_id ), version_id)); \ No newline at end of file diff --git a/services/activity-spec/activity-spec-init/pom.xml b/services/activity-spec/activity-spec-init/pom.xml new file mode 100644 index 0000000000..7873876846 --- /dev/null +++ b/services/activity-spec/activity-spec-init/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + activity-spec-init + pom + + + org.openecomp.activityspec + activity-spec + 1.2.0-SNAPSHOT + + + + + docker + + false + + + + + io.fabric8 + docker-maven-plugin + + + + onap/activity-spec-init + + + ${project.version} + + ${project.basedir} + Dockerfile + + + + + + + + + + + \ No newline at end of file diff --git a/services/activity-spec/activity-spec-init/start.sh b/services/activity-spec/activity-spec-init/start.sh new file mode 100644 index 0000000000..5242bd5d9e --- /dev/null +++ b/services/activity-spec/activity-spec-init/start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ -z "${CASSANDRA_HOST}" ]]; then + echo "CASSANDRA_HOST environment variable must be set" + exit 1 +fi + +cqlsh -f /create_activityspec_db.cql $CASSANDRA_HOST $CASSANDRA_PORT \ No newline at end of file -- cgit 1.2.3-korg