diff options
Diffstat (limited to 'deliveries')
| -rw-r--r-- | deliveries/Dockerfile.mariadb | 19 | ||||
| -rw-r--r-- | deliveries/etc.zip | bin | 9340 -> 8769 bytes | |||
| -rw-r--r-- | deliveries/os_build_febe.sh | 29 | ||||
| -rw-r--r-- | deliveries/os_docker_release.sh | 2 |
4 files changed, 35 insertions, 15 deletions
diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb index 2d79908a..f6fb5c47 100644 --- a/deliveries/Dockerfile.mariadb +++ b/deliveries/Dockerfile.mariadb @@ -4,18 +4,25 @@ FROM mariadb:latest MAINTAINER Manoop talasila@research.att.com ARG SCRIPT_DIR=${SCRIPT_DIR} +ARG SCRIPT_COMMON_DIR=${SCRIPT_COMMON_DIR} ARG SDK_SCRIPT_DIR=${SDK_SCRIPT_DIR} +ARG SDK_COMMON_SCRIPT_DIR=${SDK_COMMON_SCRIPT_DIR} +ARG DBC_COMMON_SCRIPT_DIR=${DBC_COMMON_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 ${SCRIPT_COMMON_DIR}/EcompPortalDDLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1707_Common.sql +ADD ${SCRIPT_DIR}/EcompPortalDDLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1707_OS.sql +ADD ${SCRIPT_COMMON_DIR}/EcompPortalDMLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1707_Common.sql +ADD ${SCRIPT_DIR}/EcompPortalDMLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1707_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 ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDDLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1707_Common.sql +ADD ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1707_OS.sql +ADD ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDMLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1707_Common.sql +ADD ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1707_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 +#ADD ${DBC_COMMON_SCRIPT_DIR}/dbca-ddl-mysql-1707-common.sql docker-entrypoint-initdb.d/dbca-ddl-mysql-1707-common.sql +#ADD ${DBC_SCRIPT_DIR}/dbca-dml-mysql-1707-os.sql docker-entrypoint-initdb.d/dbca-dml-mysql-1707-os.sql diff --git a/deliveries/etc.zip b/deliveries/etc.zip Binary files differindex fb4fc3c1..0d1a9290 100644 --- a/deliveries/etc.zip +++ b/deliveries/etc.zip diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh index 746b2fd4..7f6fc4c8 100644 --- a/deliveries/os_build_febe.sh +++ b/deliveries/os_build_febe.sh @@ -3,6 +3,7 @@ source $(dirname $0)/os_settings.sh export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE}" +#export MVN="mvn" CURRENTDIR="$(pwd)" @@ -22,28 +23,39 @@ mkdir $PROJECTDIR cd $CURRENTDIR cd .. -cp -r ecomp-portal-FE $PROJECTDIR/ecomp-portal-FE -cp -r ecomp-portal-BE $PROJECTDIR/ecomp-portal-BE +cp -r ecomp-portal-FE-common $PROJECTDIR/ecomp-portal-FE-common +cp -r ecomp-portal-FE-os $PROJECTDIR/ecomp-portal-FE-os +cp -r ecomp-portal-BE-common $PROJECTDIR/ecomp-portal-BE-common +cp -r ecomp-portal-BE-os $PROJECTDIR/ecomp-portal-BE-os +cp -r ecomp-portal-DB-common $PROJECTDIR/ecomp-portal-DB-common +cp -r ecomp-portal-DB-os $PROJECTDIR/ecomp-portal-DB-os + cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk #!/bin/bash shopt -s expand_aliases source ~/.bashrc -cd $PROJECTDIR/ecomp-portal-FE/ +cd $PROJECTDIR/ecomp-portal-FE-os/ + +${MVN} clean install + +cd $PROJECTDIR/ecomp-portal-BE-common ${MVN} install -cd $PROJECTDIR/ecomp-portal-BE + +cd $PROJECTDIR/ecomp-portal-BE-os ${MVN} install + # now install sdk app -cd $PROJECTDIR/ecomp-sdk/sdk-app +cd $PROJECTDIR/ecomp-sdk/epsdk-app-os ${MVN} install -mv target/ep-sdk-app-1.1.0-SNAPSHOT target/ep-sdk-app +mv target/epsdk-app-os-1.1.0-SNAPSHOT target/ep-sdk-app # now install DBC app cd $SOURCEDIR @@ -60,8 +72,9 @@ cd $DBCDIR/dcae_dmaapbc_webapp ${MVN} install -cd target -mv dmaap-bc-app.1.1.0-SNAPSHOT.0 ep-dbc-app +cd dbca-os/target + +mv dmaap-bc-app-os-1.1.0-SNAPSHOT ep-dbc-app # install into docker diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh index 35ae22bd..ba4ba235 100644 --- a/deliveries/os_docker_release.sh +++ b/deliveries/os_docker_release.sh @@ -6,7 +6,7 @@ REPO="nexus3.onap.org:10003" TIMESTAMP=$(date +%C%y%m%dT%H%M%S) VERSION="1.1.0-STAGING-${TIMESTAMP}" -LATEST="latest" +LATEST="1.1-STAGING-latest" APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}" DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}" |