diff options
| -rw-r--r-- | .idea/workspace.xml | 88 | ||||
| -rw-r--r-- | deliveries/Dockerfile.mariadb | 21 | ||||
| -rw-r--r-- | deliveries/createMaria.sh | 7 | ||||
| -rw-r--r-- | deliveries/my.cnf | 192 | ||||
| -rw-r--r-- | deliveries/os_settings.sh | 11 |
5 files changed, 304 insertions, 15 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4b4c6b7f..2858996e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pom.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/run.sh" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" afterPath="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -21,11 +20,11 @@ <favorites_list name="portal" /> </component> <component name="FileEditorManager"> - <leaf> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="179"> + <state relative-caret-position="782"> <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="57" selection-end-column="21" /> <folding /> </state> @@ -36,13 +35,13 @@ <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="476"> - <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" /> + <caret line="28" column="49" lean-forward="false" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -52,6 +51,16 @@ </provider> </entry> </file> + <file leaf-file-name="run.sh" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="Git.Settings"> @@ -66,14 +75,16 @@ <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" /> + <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/deliveries/run.sh" /> </list> </option> </component> <component name="ProjectFrameBounds"> <option name="x" value="-8" /> <option name="y" value="-8" /> - <option name="width" value="1616" /> - <option name="height" value="1176" /> + <option name="width" value="1936" /> + <option name="height" value="1056" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -90,8 +101,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> <pane id="PackagesPane" /> + <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -104,9 +115,23 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="deliveries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> - <pane id="Scratches" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -114,6 +139,7 @@ </component> <component name="RecentsManager"> <key name="CopyFile.RECENT_KEYS"> + <recent name="C:\Users\talasila\OpenECOMP\portal\deliveries" /> <recent name="C:\Users\talasila\OpenECOMP\portal" /> <recent name="C:\Users\talasila\OpenECOMP\portal\ecomp-portal-FE" /> </key> @@ -347,7 +373,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1616" height="1176" extended-state="6" /> + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -362,10 +388,10 @@ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29146692" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29144096" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2525707" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2553305" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="BPMNPalette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -395,7 +421,7 @@ <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="179"> + <state relative-caret-position="782"> <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="57" selection-end-column="21" /> <folding /> </state> @@ -404,7 +430,7 @@ <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="476"> - <caret line="28" column="49" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" /> + <caret line="28" column="49" lean-forward="false" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" /> <folding /> </state> </provider> @@ -417,5 +443,37 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="782"> + <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="57" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="476"> + <caret line="28" column="49" lean-forward="false" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> </component> </project>
\ No newline at end of file diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb new file mode 100644 index 00000000..2d79908a --- /dev/null +++ b/deliveries/Dockerfile.mariadb @@ -0,0 +1,21 @@ +FROM mariadb:latest + +#Author +MAINTAINER Manoop talasila@research.att.com + +ARG SCRIPT_DIR=${SCRIPT_DIR} +ARG SDK_SCRIPT_DIR=${SDK_SCRIPT_DIR} +ARG DBC_SCRIPT_DIR=${DBC_SCRIPT_DIR} +#Add config file +ADD my.cnf /etc/mysql/my.cnf +#ADD cluster.cnf /etc/mysql/conf.d + +#Add DDL and DML SQL files +ADD ${SCRIPT_DIR}/EcompPortalDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1610_Complete_OS.sql +ADD ${SCRIPT_DIR}/EcompPortalDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1610_Complete_OS.sql + +ADD ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1610_Complete_OS.sql +ADD ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1610_Complete_OS.sql + +ADD ${DBC_SCRIPT_DIR}/EcompSdkDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompDbcDDLMySql_1610_Complete_OS.sql +ADD ${DBC_SCRIPT_DIR}/EcompSdkDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompDbcDMLMySql_1610_Complete_OS.sql diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh new file mode 100644 index 00000000..ab053c21 --- /dev/null +++ b/deliveries/createMaria.sh @@ -0,0 +1,7 @@ +#!/bin/bash +source $(dirname $0)/os_settings.sh + +echo ${SCRIPT_DIR} + + +docker build -t ecompdb:portal --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" -f ./Dockerfile.mariadb . diff --git a/deliveries/my.cnf b/deliveries/my.cnf new file mode 100644 index 00000000..97340675 --- /dev/null +++ b/deliveries/my.cnf @@ -0,0 +1,192 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +skip-host-cache +skip-name-resolve +# +# * Basic Settings +# +#user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +lower_case_table_names = 1 +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +#bind-address = 127.0.0.1 +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 +max_allowed_packet = 16M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +#log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /var/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +#bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +#!includedir /etc/mysql/conf.d/
\ No newline at end of file diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh new file mode 100644 index 00000000..86f7f9d2 --- /dev/null +++ b/deliveries/os_settings.sh @@ -0,0 +1,11 @@ +IMGNAME=ep:1610-1 +VERSION=1.0.0 +ETCDIR=etc +WORKINGDIR=PROJECT +SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-BE/target/ecompportal +FE_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-FE +SCRIPT_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-BE/ecomp-portal-resources/sql scripts" +SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/db-scripts +DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/db-scripts +PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/target/ep-sdk-app-* +PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/target/ep-dbc-app |