diff --git a/README.md b/README.md index 46b705c..dce15a9 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,24 @@ # tml-in-docker # Dockerized TML Web System -安裝Docker +### 安裝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 +### 安裝Docker Compose $ sudo yum install epel-release $ sudo yum install -y python-pip $ sudo pip install docker-compose +### 安裝Rancher CLI +```bash +curl -LkSs https://github.com/rancher/cli/releases/download/v0.6.11/rancher-linux-amd64-v0.6.11.tar.gz | tar -xz && mv ./rancher-v0.6.11/rancher /bin/rancher && rm -rf ./rancher-v0.6.11 +``` + ### 由Private register移除Docker Image ```bash diff --git a/wildfly-tml-txgw/Dockerfile b/wildfly-tml-txgw/Dockerfile new file mode 100644 index 0000000..1875cc8 --- /dev/null +++ b/wildfly-tml-txgw/Dockerfile @@ -0,0 +1,12 @@ +FROM khhwtml02t.wanhai.com:8182/jboss/wildfly-tml:latest + +#set environment +ENV JAVA_OPTS="-Dcom.wanhai.tml.yard.current=TXGW" + +#prepare tmp dir +COPY --chown=jboss . ${JBOSS_HOME}/config + +#customize settings & cleanup +RUN cd ${JBOSS_HOME}/config/initial && ./setup.sh && rm -rf ${JBOSS_HOME}/config + +# COPY --chown=jboss WHL_TML.ear ${JBOSS_HOME}/standalone/deployments/WHL_TML.ear diff --git a/wildfly-tml-txgw/buildImage.sh b/wildfly-tml-txgw/buildImage.sh new file mode 100644 index 0000000..3afc29e --- /dev/null +++ b/wildfly-tml-txgw/buildImage.sh @@ -0,0 +1,4 @@ +tag="khhwtml02t.wanhai.com:8182/wanhai/tml/txgw/wildfly-tml-txgw:latest" +docker build --rm -t ${tag} . +docker push ${tag} +docker container prune -f && docker image prune -f && docker volume prune -f && docker network prune -f \ No newline at end of file diff --git a/wildfly-tml-txgw/config/standalone.xml b/wildfly-tml-txgw/config/standalone.xml new file mode 100644 index 0000000..dce1a7b --- /dev/null +++ b/wildfly-tml-txgw/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:@txgw6.wanhai.com:1521:whlt + oracle.jdbc.OracleDriver + oracle + + TXGWWEB01 + TXGWWEB180829 + + + + true + + + + + + + + + + + org.h2.jdbcx.JdbcDataSource + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jboss.bind.address:127.0.0.1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wildfly-tml-txgw/initial/setup.sh b/wildfly-tml-txgw/initial/setup.sh new file mode 100644 index 0000000..825c7c8 --- /dev/null +++ b/wildfly-tml-txgw/initial/setup.sh @@ -0,0 +1,2 @@ +#customize config +cp ../config/*.* ${JBOSS_HOME}/standalone/configuration/ \ No newline at end of file diff --git a/wildfly_tml/config/META-INF/tml-config.xml b/wildfly_tml/config/META-INF/tml-config.xml index d4d32e8..916a286 100644 --- a/wildfly_tml/config/META-INF/tml-config.xml +++ b/wildfly_tml/config/META-INF/tml-config.xml @@ -2,7 +2,7 @@ - + whlt_khhw5 @@ -20,7 +20,7 @@ /collab/ott/oneTimeTicket.jsp - + whlt_txgw5 @@ -38,6 +38,6 @@ /collab/ott/oneTimeTicket.jsp - + \ No newline at end of file diff --git a/wildfly_tml/config/standalone-minimal.xml b/wildfly_tml/config/standalone-minimal.xml new file mode 100644 index 0000000..169e09d --- /dev/null +++ b/wildfly_tml/config/standalone-minimal.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wildfly_tml/initial/setup.sh b/wildfly_tml/initial/setup.sh index 8ac8775..2a4ae3f 100755 --- a/wildfly_tml/initial/setup.sh +++ b/wildfly_tml/initial/setup.sh @@ -1,3 +1,5 @@ +#copy wildfly config profile +cp ../config/*.xml ${JBOSS_HOME}/standalone/configuration/ #create default EAR Module WHL_TML.ear earDir=${JBOSS_HOME}'/standalone/deployments/WHL_TML.ear' earLibDir='lib' diff --git a/wildfly_tml_khhw/Dockerfile b/wildfly_tml_khhw/Dockerfile index 2e5294d..07ed4e6 100644 --- a/wildfly_tml_khhw/Dockerfile +++ b/wildfly_tml_khhw/Dockerfile @@ -1,5 +1,8 @@ FROM khhwtml02t.wanhai.com:8182/jboss/wildfly-tml:latest +#set environment +ENV JAVA_OPTS="-Dcom.wanhai.tml.yard.current=KHHW" + #prepare tmp dir COPY --chown=jboss . ${JBOSS_HOME}/config