From 7cd70179f960c7f5c0b6ac4729f5b85eac7b544f Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 1 Jun 2018 18:14:38 +0800 Subject: [PATCH] Daily Commit --- README.md | 16 +++++++++++++++- wildfly/Dockerfile | 34 +++------------------------------ wildfly/modules/make_modules.sh | 9 ++++++++- wildfly/modules/module_zk7.xml | 4 ---- wildfly/modules/module_zk8.xml | 4 ---- wildfly/startwf-ha.sh | 2 +- 6 files changed, 27 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 6ba572e..8af9c35 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,16 @@ -# tml-in-docker +# tml-in-docker # Dockerized TML Web System + +安裝Docker + + $ wget -qO- https://get.docker.com/ | sh + $ sudo usermod -aG docker $(whoami) + $ sudo systemctl enable docker.service + $ sudo systemctl start docker.service + +安裝Docker Compose + + $ sudo yum install epel-release + $ sudo yum install -y python-pip + $ sudo pip install docker-compose + diff --git a/wildfly/Dockerfile b/wildfly/Dockerfile index 5d09f88..19c3106 100755 --- a/wildfly/Dockerfile +++ b/wildfly/Dockerfile @@ -15,40 +15,12 @@ COPY ./modules/* /tmp/modules/ #create additional modules RUN /tmp/modules/make_modules.sh -#setup zk module(8.0.2.2) -# RUN mkdir -p /zk_lib && \ -# mkdir -p /opt/jboss/wildfly/modules/system/layers/base/org/zkoss/zk/main && \ -# curl -#L https://www.zkoss.org/zkdownload/downloadEvalFile?id=1884780989 | bsdtar -xf- -C /zk_lib && \ -# find /zk_lib/zk-bin-8.0.2.2/dist/lib -name '*.jar' | xargs -I{} cp {} /opt/jboss/wildfly/modules/system/layers/base/org/zkoss/zk/main && \ -# rm -rf ./zk_lib -# COPY module_zk8.xml /opt/jboss/wildfly/modules/system/layers/base/org/zkoss/zk/main/module.xml - -#setup zk module(7.0.3) -# RUN mkdir -p /zk_lib && cd /zk_lib && \ -# curl -o zcommon.jar http://central.maven.org/maven2/org/zkoss/common/zcommon/7.0.3/zcommon-7.0.3.jar && \ -# curl -o zweb.jar http://central.maven.org/maven2/org/zkoss/common/zweb/7.0.3/zweb-7.0.3.jar && \ -# curl -o zul.jar http://central.maven.org/maven2/org/zkoss/zk/zul/7.0.3/zul-7.0.3.jar && \ -# curl -o zk.jar http://central.maven.org/maven2/org/zkoss/zk/zk/7.0.3/zk-7.0.3.jar && \ -# curl -o zkplus.jar http://central.maven.org/maven2/org/zkoss/zk/zkplus/7.0.3/zkplus-7.0.3.jar && \ -# curl -o zhtml.jar http://central.maven.org/maven2/org/zkoss/zk/zhtml/7.0.3/zhtml-7.0.3.jar && \ -# curl -o zkbind.jar http://central.maven.org/maven2/org/zkoss/zk/zkbind/7.0.3/zkbind-7.0.3.jar && \ -# curl -o zel.jar http://central.maven.org/maven2/org/zkoss/common/zel/7.0.3/zel-7.0.3.jar && \ -# curl -o silvertail.jar http://central.maven.org/maven2/org/zkoss/theme/silvertail/7.0.3/silvertail-7.0.3.jar && \ -# curl -o sapphire.jar http://central.maven.org/maven2/org/zkoss/theme/sapphire/7.0.3/sapphire-7.0.3.jar && \ -# curl -o zsoup.jar http://mavensync.zkoss.org/maven2/org/zkoss/zsoup/1.8.2.5/zsoup-1.8.2.5.jar && \ -# curl -o bsh.jar http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar && \ -# curl -o slf4j-api.jar http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar && \ -# curl -o slf4j-jdk14.jar http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar && \ - -# COPY module_zk7.xml /opt/jboss/wildfly/modules/system/layers/base/org/zkoss/zk/main/module.xml - # Add your application to the deployment folder -# COPY ${WAR_FILE_FROM} /opt/jboss/wildfly/standalone/deployments/${WAR_FILE_DEPLOY} -# COPY standalone-ha.xml /opt/jboss/wildfly/standalone/configuration/standalone-ha.xml -COPY startwf-ha.sh /opt/jboss/wildfly/bin/startwf-ha.sh +COPY ${WAR_FILE_FROM} ${JBOSS_HOME}/standalone/deployments/${WAR_FILE_DEPLOY} +COPY startwf-ha.sh ${JBOSS_HOME}/bin/startwf-ha.sh # Add user for adminstration purpose -RUN /opt/jboss/wildfly/bin/add-user.sh admin admin123 --silent +RUN ${JBOSS_HOME}/bin/add-user.sh admin wanhai_2 --silent USER jboss EXPOSE 8080 9990 diff --git a/wildfly/modules/make_modules.sh b/wildfly/modules/make_modules.sh index 3d4402b..dbcd3e3 100755 --- a/wildfly/modules/make_modules.sh +++ b/wildfly/modules/make_modules.sh @@ -1,8 +1,14 @@ #variablies -WF_MODULE_PATH='/opt/jboss/wildfly/modules/system/layers/base' +WF_MODULE_PATH=${JBOSS_HOME}'/modules/system/layers/base' ZK8_VER='8.0.2.2' ZK7_VER='7.0.3' +#setup org.apache.commons.fileupload +echo 'Download jars of org.apache.commons.fileupload =>' +mkdir -p ${WF_MODULE_PATH}/org/apache/commons/fileupload/main +curl -# -o ${WF_MODULE_PATH}/org/apache/commons/fileupload/main/commons-fileupload.jar http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar +cp /tmp/modules/module_commons_fileupload.xml ${WF_MODULE_PATH}/org/apache/commons/fileupload/main/module.xml + #setup zk module(7.0.3) echo 'Download jars of zk-'${ZK7_VER} '=>' mkdir -p ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER} @@ -21,6 +27,7 @@ curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/bsh.jar http://central.mave curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/slf4j-api.jar http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/slf4j-jdk14.jar http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar cp /tmp/modules/module_zk7.xml ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/module.xml + #setup zk module(8.0.2.2) echo 'Download jars of zk-'${ZK8_VER} '=>' mkdir -p ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER} diff --git a/wildfly/modules/module_zk7.xml b/wildfly/modules/module_zk7.xml index c1caf00..8f190e5 100755 --- a/wildfly/modules/module_zk7.xml +++ b/wildfly/modules/module_zk7.xml @@ -38,10 +38,6 @@ - - diff --git a/wildfly/modules/module_zk8.xml b/wildfly/modules/module_zk8.xml index e329877..06c5a4b 100755 --- a/wildfly/modules/module_zk8.xml +++ b/wildfly/modules/module_zk8.xml @@ -38,10 +38,6 @@ - - diff --git a/wildfly/startwf-ha.sh b/wildfly/startwf-ha.sh index 7e90a1d..d2a3110 100755 --- a/wildfly/startwf-ha.sh +++ b/wildfly/startwf-ha.sh @@ -1,7 +1,7 @@ # IPADDRESS=$(ifconfig | grep -A 1 'eth0' | tail -1 | awk -F ' ' '{print $2}') IPADDRESS=$(hostname -i) # MCASTADDRESS=234.0.0.4 -/opt/jboss/wildfly/bin/standalone.sh -c standalone.xml -b ${IPADDRESS} +/opt/jboss/wildfly/bin/standalone.sh -c standalone.xml -b ${IPADDRESS} -Djboss.bind.address.management=${IPADDRESS} # -u ${MCASTADDRESS} \ # -Djboss.bind.address=${IPADDRESS} \ # -Djboss.bind.address.management=${IPADDRESS} \