From e1fb7883fcc273b609fcffcf1e3b455bc13e724d Mon Sep 17 00:00:00 2001 From: richard Date: Sun, 19 Aug 2018 23:42:37 +0800 Subject: [PATCH] daily commit --- wildfly_tml/Dockerfile | 3 +- wildfly_tml/modules/make_modules.sh | 35 +- .../modules/module_commons_digester.xml | 36 ++ .../modules/module_jasperreports_641.xml | 2 +- wildfly_tml_khhw/Dockerfile | 17 + wildfly_tml_khhw/config/standalone.xml | 530 ++++++++++++++++++ wildfly_tml_khhw/initial/setup.sh | 3 + wildfly_tml_khhw/initial/startwf.sh | 5 + 8 files changed, 623 insertions(+), 8 deletions(-) create mode 100644 wildfly_tml/modules/module_commons_digester.xml create mode 100644 wildfly_tml_khhw/Dockerfile create mode 100644 wildfly_tml_khhw/config/standalone.xml create mode 100755 wildfly_tml_khhw/initial/setup.sh create mode 100755 wildfly_tml_khhw/initial/startwf.sh diff --git a/wildfly_tml/Dockerfile b/wildfly_tml/Dockerfile index bc1ae2d..aa58dc0 100755 --- a/wildfly_tml/Dockerfile +++ b/wildfly_tml/Dockerfile @@ -1,4 +1,5 @@ -FROM shihxuancheng/wildfly-base:latest +#FROM shihxuancheng/wildfly-base:latest +FROM khhwtml02t.wanhai.com:8182/jboss/wildfly-base:latest # Environment variable with default value ENV WF_CONFIG="standalone.xml" diff --git a/wildfly_tml/modules/make_modules.sh b/wildfly_tml/modules/make_modules.sh index 77f6cfa..ad6bbd7 100755 --- a/wildfly_tml/modules/make_modules.sh +++ b/wildfly_tml/modules/make_modules.sh @@ -4,7 +4,7 @@ WF_MODULE_PATH=${JBOSS_HOME}'/modules' #setup module google gson(2.7) echo 'Download jars of google gson =>' mkdir -p ${WF_MODULE_PATH}/com/google/gson/main -curl -# -o ${WF_MODULE_PATH}/com/google/gson/main/gson-2.7.jar.jar http://central.maven.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.jar +curl -# -o ${WF_MODULE_PATH}/com/google/gson/main/gson-2.7.jar http://central.maven.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.jar cp ./module_gson.xml ${WF_MODULE_PATH}/com/google/gson/main/module.xml #setup module of apache commons-logging (1.1.3) @@ -16,11 +16,17 @@ cp ./module_commons_logging_113.xml ${WF_MODULE_PATH}/org/apache/commons/logging mkdir ${WF_MODULE_PATH}/org/apache/commons/main && cp ./module_commons_logging.xml ${WF_MODULE_PATH}/org/apache/commons/main/module.xml #setup module of apache commons-net(3.6) -echo 'Download jars of common-net =>' +echo 'Download jars of commons-net =>' mkdir -p ${WF_MODULE_PATH}/org/apache/commons/net/main -curl -# -o ${WF_MODULE_PATH}//org/apache/commons/net/main/commons-net-3.6.jar http://central.maven.org/maven2/commons-net/commons-net/3.6/commons-net-3.6.jar +curl -# -o ${WF_MODULE_PATH}/org/apache/commons/net/main/commons-net-3.6.jar http://central.maven.org/maven2/commons-net/commons-net/3.6/commons-net-3.6.jar cp ./module_commons_net.xml ${WF_MODULE_PATH}/org/apache/commons/net/main/module.xml +#setup module of apache commons-digester(1.6) +echo 'Download jars of commons-digester =>' +mkdir -p ${WF_MODULE_PATH}/org/apache/commons/digester/main +curl -# -o ${WF_MODULE_PATH}/org/apache/commons/digester/main/commons-digester.jar http://central.maven.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.jar +cp ./module_commons_digester.xml ${WF_MODULE_PATH}/org/apache/commons/digester/main/module.xml + #setup module of groovy(2.4.7) echo 'Download jars of groovy=>' mkdir -p ${WF_MODULE_PATH}/org/codehaus/groovy/main @@ -76,14 +82,31 @@ curl -# -o ${WF_MODULE_PATH}/net/sf/jasperreports/6.4.1/jasperreports-6.4.1.jar cp ./module_jasperreports_641.xml ${WF_MODULE_PATH}/net/sf/jasperreports/6.4.1/module.xml #setup default slot of jasperreports module(default is 6.4.1) mkdir ${WF_MODULE_PATH}/net/sf/jasperreports/main && cp ./module_jasperreports.xml ${WF_MODULE_PATH}/net/sf/jasperreports/main/module.xml - -#setup module of jasperreports font - #setup module of wanhai base +echo 'Download jars of com.wanhai.base=>' +mkdir -p ${WF_MODULE_PATH}/com/wanhai/base/main +curl -# -o ${WF_MODULE_PATH}/com/wanhai/base/main/whl-utility.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/base/whl-utility/1.0.0/whl-utility-1.0.0.jar +curl -# -o ${WF_MODULE_PATH}/com/wanhai/base/main/whl-security-fake.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/base/whl-security/1.0.0/whl-security-1.0.0.jar +curl -# -o ${WF_MODULE_PATH}/com/wanhai/base/main/whl-biz.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/base/whl-biz/1.0.0/whl-biz-1.0.0.jar +cp ./module_wanhai_base.xml ${WF_MODULE_PATH}/com/wanhai/base/main/module.xml #setup module of wanhai zk base +echo 'Download jars of com.wanhai.zk=>' +mkdir -p ${WF_MODULE_PATH}/com/wanhai/zk/main +curl -# -o ${WF_MODULE_PATH}/com/wanhai/zk/main/whl-zk-template.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/zk/whl-template/1.0.0/whl-template-1.0.0.jar +curl -# -o ${WF_MODULE_PATH}/com/wanhai/zk/main/whl-zk-base.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/zk/whl-zk-base/1.0.0/whl-zk-base-1.0.0.jar +cp ./module_wanhai_zk.xml ${WF_MODULE_PATH}/com/wanhai/zk/main/module.xml #setup module of tml base #setup module of tml vo +echo 'Download jars of com.wanhai.tml.vo=>' +mkdir -p ${WF_MODULE_PATH}/com/wanhai/tml/vo/main +curl -# -o ${WF_MODULE_PATH}/com/wanhai/tml/vo/main/whl-vo-sec.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/tml/whl-vo-sec/0.1.0/whl-vo-sec-0.1.0.jar +curl -# -o ${WF_MODULE_PATH}/com/wanhai/tml/vo/main/whl-vo-tml.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/tml/whl-vo-tml/0.1.0/whl-vo-tml-0.1.0.jar +cp ./module_tml_vo.xml ${WF_MODULE_PATH}/com/wanhai/tml/vo/main/module.xml #setup module of tml bizbean +echo 'Download jars of com.wanhai.tml.bizbean=>' +mkdir -p ${WF_MODULE_PATH}/com/wanhai/tml/bizbean/main +curl -# -o ${WF_MODULE_PATH}/com/wanhai/tml/bizbean/main/whl-biztml.jar http://khhwtml02t.wanhai.com:8181/repository/maven-releases/com/wanhai/tml/whl-biztml/0.1.0/whl-biztml-0.1.0.jar +cp ./module_tml_bizbean.xml ${WF_MODULE_PATH}/com/wanhai/tml/bizbean/main/module.xml diff --git a/wildfly_tml/modules/module_commons_digester.xml b/wildfly_tml/modules/module_commons_digester.xml new file mode 100644 index 0000000..a700158 --- /dev/null +++ b/wildfly_tml/modules/module_commons_digester.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/wildfly_tml/modules/module_jasperreports_641.xml b/wildfly_tml/modules/module_jasperreports_641.xml index e96a1e8..aee3479 100644 --- a/wildfly_tml/modules/module_jasperreports_641.xml +++ b/wildfly_tml/modules/module_jasperreports_641.xml @@ -33,7 +33,7 @@ - + diff --git a/wildfly_tml_khhw/Dockerfile b/wildfly_tml_khhw/Dockerfile new file mode 100644 index 0000000..3c69852 --- /dev/null +++ b/wildfly_tml_khhw/Dockerfile @@ -0,0 +1,17 @@ +FROM khhwtml02t.wanhai.com:8182/jboss/wildfly-tml:0.1.0 +LABEL maintainer="richard_shih@wanhai.com" + +#prepare tmp dir +COPY --chown=jboss . ${JBOSS_HOME}/config + +#customize settings +RUN cd ${JBOSS_HOME}/config/initial && ./setup.sh + +#cleanup +RUN rm -rf ${JBOSS_HOME}/config + +COPY --chown=jboss WHL_TML.ear ${JBOSS_HOME}/standalone/deployments/WHL_TML.ear + +EXPOSE 8080 9990 + +CMD ["sh","-c","/opt/jboss/wildfly/bin/startwf.sh"] \ No newline at end of file diff --git a/wildfly_tml_khhw/config/standalone.xml b/wildfly_tml_khhw/config/standalone.xml new file mode 100644 index 0000000..470ebea --- /dev/null +++ b/wildfly_tml_khhw/config/standalone.xml @@ -0,0 +1,530 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE + h2 + + sa + sa + + + + jdbc:oracle:thin:@khhw6.wanhai.com:1521:whlt + oracle.jdbc.OracleDriver + oracle + + KHHTMLWEB01 + webkhhtml180713 + + + + true + + + + + + + + + + + org.h2.jdbcx.JdbcDataSource + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jboss.bind.address:127.0.0.1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wildfly_tml_khhw/initial/setup.sh b/wildfly_tml_khhw/initial/setup.sh new file mode 100755 index 0000000..7208ae9 --- /dev/null +++ b/wildfly_tml_khhw/initial/setup.sh @@ -0,0 +1,3 @@ +cp ./startwf.sh ${JBOSS_HOME}/bin/startwf.sh +#customize config +cp ../config/*.* ${JBOSS_HOME}/standalone/configuration/ \ No newline at end of file diff --git a/wildfly_tml_khhw/initial/startwf.sh b/wildfly_tml_khhw/initial/startwf.sh new file mode 100755 index 0000000..7cce0b1 --- /dev/null +++ b/wildfly_tml_khhw/initial/startwf.sh @@ -0,0 +1,5 @@ +#variables +IPADDRESS=$(hostname -i) +/opt/jboss/wildfly/bin/standalone.sh -c ${WF_CONFIG} -b ${IPADDRESS} -Djboss.bind.address.management=${IPADDRESS} + +