From d332e89eb9bbaf280604c61715422dde3542813c Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 12 Jul 2017 16:26:42 -0400 Subject: Configure parent to skip deploy step Change-Id: If65458934e12e3f7f61cf080ba8f99d7d233f291 Signed-off-by: Christopher Lott (cl778h) --- deliveries/createMaria.sh | 4 +++- deliveries/os_Dockerfile | 13 +++++++------ deliveries/os_build_febe.sh | 39 +++++++++------------------------------ deliveries/os_settings.sh | 2 +- deliveries/run.sh | 5 +++-- 5 files changed, 23 insertions(+), 40 deletions(-) (limited to 'deliveries') diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh index 6b70adff..0b3de0b7 100755 --- a/deliveries/createMaria.sh +++ b/deliveries/createMaria.sh @@ -1,7 +1,9 @@ #!/bin/bash +# Stop on errors; show output +set -e -x + 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}" --build-arg SCRIPT_COMMON_DIR="${SCRIPT_COMMON_DIR}" --build-arg SDK_COMMON_SCRIPT_DIR="${SDK_COMMON_SCRIPT_DIR}" --build-arg DBC_COMMON_SCRIPT_DIR="${DBC_COMMON_SCRIPT_DIR}" -f ./Dockerfile.mariadb . diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile index 36ecd85f..d4bfeda2 100644 --- a/deliveries/os_Dockerfile +++ b/deliveries/os_Dockerfile @@ -55,17 +55,18 @@ ARG PORTAL_SDK_DIR=${PORTAL_SDK_DIR} ARG PORTAL_DBC_DIR=${PORTAL_DBC_DIR} # Set up variables: ENV TOMCATHOME /opt/apache-tomcat-8.0.37 -ENV SDKHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP +ENV PORTALHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP ENV PORTALSDKHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP ENV PORTALDBCHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP # Install Common Software,Git,Apache -RUN mkdir -p $SDKHOME && mkdir -p $PORTALSDKHOME && mkdir -p $PORTALDBCHOME +RUN mkdir -p $PORTALHOME && mkdir -p $PORTALSDKHOME && mkdir -p $PORTALDBCHOME -COPY ${SDK_DIR} ${SDKHOME}/ +COPY ${SDK_DIR} ${PORTALHOME}/ +# step 33 COPY ${PORTAL_SDK_DIR} ${PORTALSDKHOME}/ COPY ${PORTAL_DBC_DIR} ${PORTALDBCHOME}/ -RUN ln -s ${SDKHOME} ${TOMCATHOME}/webapps/ECOMPPORTAL && ln -s ${PORTALSDKHOME} ${TOMCATHOME}/webapps/ECOMPSDKAPP && ln -s ${PORTALDBCHOME} ${TOMCATHOME}/webapps/ECOMPDBCAPP +RUN ln -s ${PORTALHOME} ${TOMCATHOME}/webapps/ECOMPPORTAL && ln -s ${PORTALSDKHOME} ${TOMCATHOME}/webapps/ECOMPSDKAPP && ln -s ${PORTALDBCHOME} ${TOMCATHOME}/webapps/ECOMPDBCAPP # Define working directory. @@ -75,9 +76,9 @@ VOLUME ${TOMCATHOME}/logs ENV PATH $PATH:$JAVA_HOME/bin:${TOMCATHOME}/bin COPY configure-and-run.sh /PROJECT/OpenSource/UbuntuEP/ -#RUN cp -r ${FE_DIR}/dist/public ${SDKHOME}/public +#RUN cp -r ${FE_DIR}/dist/public ${PORTALHOME}/public -COPY ${FE_DIR}/dist/public ${SDKHOME} +COPY ${FE_DIR}/dist/public ${PORTALHOME} # Define default command. #CMD ["bash"] CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"] diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh index 64e166c3..18cfc374 100755 --- a/deliveries/os_build_febe.sh +++ b/deliveries/os_build_febe.sh @@ -1,13 +1,14 @@ #!/bin/bash +# Stop on error; show output +set -e -x source $(dirname $0)/os_settings.sh # Use -B for batch operation to skip download progress output export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B" - +#MVN=mvn CURRENTDIR="$(pwd)" - # install ecomp portal rm -rf $CURRENTDIR/$WORKINGDIR mkdir $CURRENTDIR/$WORKINGDIR @@ -24,64 +25,42 @@ cd $CURRENTDIR cd .. 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-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-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 - +cp -r ecomp-portal-DB-os $PROJECTDIR/ecomp-portal-DB-os +cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk cd $PROJECTDIR/ecomp-portal-BE-common - ${MVN} install - cd $PROJECTDIR/ecomp-portal-BE-os - -${MVN} install - - -# now install sdk app -cd $PROJECTDIR/ecomp-sdk/epsdk-app-os - ${MVN} install cd $PROJECTDIR/ecomp-portal-FE-os/ - ${MVN} install -mv target/epsdk-app-os target/ep-sdk-app +cd $PROJECTDIR/ecomp-sdk/epsdk-app-os +${MVN} install # now install DBC app cd $SOURCEDIR DBCDIR=$SOURCEDIR/ST_DBPA mkdir $DBCDIR - #copy DBC project cd $CURRENTDIR cd .. - cp -r dmaapbc/dcae_dmaapbc_webapp $DBCDIR/dcae_dmaapbc_webapp - cd $DBCDIR/dcae_dmaapbc_webapp - ${MVN} install - cd dbca-os/target - mv dmaap-bc-app-os-1.1.0-SNAPSHOT ep-dbc-app # Build complete database script in the "OS" script area cd ../db-scripts cat dbca-create-mysql-1707-os.sql ../../dbca-common/db-scripts/dbca-ddl-mysql-1707-common.sql dbca-dml-mysql-1707-os.sql > dbca-complete-mysql-1707-os.sql - # install into docker cd $CURRENTDIR diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh index 0ad53fdc..68d3db80 100755 --- a/deliveries/os_settings.sh +++ b/deliveries/os_settings.sh @@ -12,5 +12,5 @@ SDK_COMMON_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-commo SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/db-scripts DBC_COMMON_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-common/db-scripts DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/db-scripts -PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/target/ep-sdk-app +PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/target/epsdk-app-os PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/target/ep-dbc-app diff --git a/deliveries/run.sh b/deliveries/run.sh index 92cf1b9c..ff214161 100755 --- a/deliveries/run.sh +++ b/deliveries/run.sh @@ -1,5 +1,6 @@ #!/bin/bash - +# Stop on errors; show output +set -e -x ./os_build_febe.sh ./createMaria.sh -docker images \ No newline at end of file +docker images -- cgit 1.2.3-korg