Merge pull request #97 from TIBCOSoftware/feature-cloud-enhancements

Feature cloud enhancements

Author: rameshpolishetti

.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+cloud/docker/bin/tmp*/**
+cloud/docker/frominstall/tmp_*
+cloud/kubernetes/helm/charts/

README.md

@@ -1,3 +1,7 @@
 # Tools for TIBCO BusinessEvents®
 The `be-tools` repository provide different tools to work on TIBCO BusinessEvents® applications.
 The `cloud` folder provides tools that enables you deploy and monitor your TIBCO BusinessEvents applications on different cloud platforms by using Docker and Kubernetes.
+
+## Documentation
+
+TIBCO BusinessEvents® documentation is available at [wiki pages](https://github.com/TIBCOSoftware/be-tools/wiki).

cloud/README.md

@@ -2,28 +2,4 @@
 
 The `cloud` folder provide tools that enables you deploy and monitor your TIBCO BusinessEvents applications on different cloud platforms by using Docker and Kubernetes.   
 
-To use these tools and scripts for your TIBCO BusinessEvents applications, clone or download the `cloud` folder to BE_HOME. For more information on how to use those scripts after copying them to BE_HOME, see [TIBCO BusinessEvents Cloud Deployment Guide](https://docs.tibco.com/dyno/businessevents-enterprise/5.6.1/doc/html/GUID-EB00D602-12FD-4C4D-835D-2ECBBB32D235.html).
-
-## Docker Tools
-
-By using the scripts provided in the `docker` folder, you can containerize and run a TIBCO BusinessEvents application in Docker.  The folder contains scripts and Dockerfiles that you can use to build Docker images of the following:
-
-- TIBCO BusinessEvents application
-
-- Rule Management Server (RMS)
-
-- TIBCO BusinessEvents Enterprise Administrator Agent
-
-## Kubernetes Tools
-
-The  `kubernetes` folder provides sample YAML files to create the Kubernetes objects required for running sample TIBCO BusinessEvents applications on the Kubernetes cluster based on different cloud platforms. It also provides `readme.html` files with instructions that help you to run and test these applications. 
-
-The  `kubernetes` folder provides sample YAML files and `readme.html` files for the following scenarios based on your cloud platform:
-
-- Running an in-memory application
-
-- Running a cache-based application with different persistence options
-
-- Running RMS to manage business rules through WebStudio
-
-- Running TIBCO BusinessEvents Enterprise Administrator Agent to monitor applications on the Kubernetes cluster
+To use these tools and scripts for your TIBCO BusinessEvents applications, clone or download the `cloud` folder to BE_HOME. For more information on how to use those scripts after copying them to BE_HOME, see the documentation at [wiki pages](https://github.com/TIBCOSoftware/be-tools/wiki).

cloud/docker/README.md

@@ -0,0 +1,13 @@
+# Docker Tools
+
+By using the scripts provided in the `docker` folder, you can containerize and run a TIBCO BusinessEvents application in Docker. The folder contains scripts and Dockerfiles that you can use to build Docker images for the following:
+
+- TIBCO BusinessEvents Application
+
+- TIBCO BusinessEvents Rule Management Server
+
+- TIBCO BusinessEvents Enterprise Administrator Agent
+
+## Documentation
+
+TIBCO BusinessEvents® documentation is available at [wiki pages](https://github.com/TIBCOSoftware/be-tools/wiki).

cloud/docker/bin/Dockerfile

@@ -1,3 +1,8 @@
+
+#
+# Copyright (c) 2019-2020. TIBCO Software Inc.
+# This file is subject to the license terms contained in the license file that is distributed with this file.
+#
 #
 # BusinessEvents Dockerfile
 #
@@ -9,8 +14,12 @@ ARG JRE_VERSION
 ARG CDD_FILE_NAME
 ARG EAR_FILE_NAME
 ARG AS_SHORT_VERSION
+ARG FTL_VERSION
+ARG FTL_SHORT_VERSION
+ARG ACTIVESPACES_VERSION
+ARG ACTIVESPACES_SHORT_VERSION
 
-FROM ubuntu:latest as intermediate
+FROM ubuntu:20.10 as intermediate
 
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
@@ -21,6 +30,12 @@ ARG BE_PRODUCT_ADDONS
 ARG BE_PRODUCT_HOTFIX
 ARG AS_PRODUCT_HOTFIX
 ARG AS_VERSION
+ARG FTL_VERSION
+ARG FTL_SHORT_VERSION
+ARG FTL_PRODUCT_HOTFIX
+ARG ACTIVESPACES_VERSION
+ARG ACTIVESPACES_SHORT_VERSION
+ARG ACTIVESPACES_PRODUCT_HOTFIX
 ARG DOCKERFILE_NAME
 ARG JRE_VERSION
 ARG TEMP_FOLDER
@@ -46,31 +61,42 @@ ENV TIBCO_HOME=/opt/tibco \
 
 WORKDIR /home/tibco/be
 RUN chmod +x *.sh *.pm
+RUN perl -I. -Mbe_docker_install -e "be_docker_install::install_ftl('$FTL_VERSION','$FTL_PRODUCT_HOTFIX')"
+RUN perl -I. -Mbe_docker_install -e "be_docker_install::install_activespaces('$ACTIVESPACES_VERSION','$ACTIVESPACES_PRODUCT_HOTFIX')"
 RUN perl -I. -Mbe_docker_install -e "be_docker_install::install_be('$BE_PRODUCT_VERSION','enterprise','$BE_PRODUCT_ADDONS','$BE_PRODUCT_HOTFIX','$AS_PRODUCT_HOTFIX','$AS_VERSION')"
 RUN perl -I. -Mbe_docker_install -e "be_docker_install::replaceRunbeVersionToken('$BE_PRODUCT_VERSION','./run')"
 RUN perl -I. -Mbe_docker_install -e "be_docker_install::generateAnnotationIndexes('/opt/tibco/be/${BE_SHORT_VERSION}', '/opt/tibco/tibcojre64/${JRE_VERSION}')" \
- && rm -rf as_installers be_installers *.zip \
+ && rm -rf as_installers be_installers ftl_installers ftl_installers_hf activespaces_installers activespaces_installers_hf *.zip \
  && find . -regex "./Dockerfile.*" ! -name '$DOCKERFILE_NAME' -delete
 
 WORKDIR /opt/tibco/be/$BE_SHORT_VERSION/bin/
-RUN echo "java.property.be.engine.cluster.as.discover.url=%AS_DISCOVER_URL%" >> be-engine.tra  \
+RUN echo \ >> be-engine.tra \
+ && echo "java.property.be.engine.cluster.as.discover.url=%AS_DISCOVER_URL%" >> be-engine.tra  \
  && echo "java.property.be.engine.cluster.as.listen.url=%AS_LISTEN_URL%" >> be-engine.tra \
  && echo "java.property.be.engine.cluster.as.remote.listen.url=%AS_REMOTE_LISTEN_URL%" >> be-engine.tra \
  && echo "java.property.com.sun.management.jmxremote.rmi.port=%jmx_port%" >> be-engine.tra
 
+#set ftl home in tra file
+RUN sed -i "[email protected][email protected]_HOME=/opt/tibco/ftl/$FTL_SHORT_VERSION@g" be-engine.tra
+
+#set activespaces home in tra file
+RUN sed -i "[email protected][email protected]_HOME=/opt/tibco/as/$ACTIVESPACES_SHORT_VERSION@g" be-engine.tra
+
 # Setup gv providers
 RUN chmod +x /home/tibco/be/gvproviders/*.sh && /home/tibco/be/gvproviders/setup.sh ${GVPROVIDERS}
 
 # Cleanup.
 RUN mkdir -p /opt/tibco/as/${AS_SHORT_VERSION}/ \
- && mkdir -p /opt/tibco/as/${AS_SHORT_VERSION}/bin \
- && mkdir -p /opt/tibco/as/${AS_SHORT_VERSION}/lib \
- && rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/gwt \
- && rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/tomsawyer \
- && rm -rf /home/tibco/be/be_installers-hf
+    && mkdir -p /opt/tibco/as/${AS_SHORT_VERSION}/bin \
+    && mkdir -p /opt/tibco/as/${AS_SHORT_VERSION}/lib \
+    && mkdir -p /opt/tibco/ftl/${FTL_SHORT_VERSION}/lib \
+    && mkdir -p /opt/tibco/as/${ACTIVESPACES_SHORT_VERSION}/lib \
+    && rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/gwt \
+    && rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/tomsawyer \
+    && rm -rf /home/tibco/be/be_installers-hf
 
 #Discard intermediate image and just copy the installation to a new image.
-FROM ubuntu:latest
+FROM ubuntu:20.10
 
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
@@ -80,21 +106,30 @@ ARG AS_SHORT_VERSION
 ARG JRE_VERSION
 ARG CDD_FILE_NAME
 ARG EAR_FILE_NAME
+ARG FTL_VERSION
+ARG FTL_SHORT_VERSION
+ARG ACTIVESPACES_VERSION
+ARG ACTIVESPACES_SHORT_VERSION
 
 COPY app/${CDD_FILE_NAME} /opt/tibco/be/application/
 COPY app/${EAR_FILE_NAME} /opt/tibco/be/application/ear/
 COPY app/* /opt/tibco/be/ext/
 
 COPY --from=intermediate /home/tibco/be /home/tibco/be
 
+# copy jre
 COPY --from=intermediate /opt/tibco/tibcojre64/${JRE_VERSION} /opt/tibco/tibcojre64/${JRE_VERSION}
-
+# copy be related files
 COPY --from=intermediate /opt/tibco/be/${BE_SHORT_VERSION}/bin/be-engine* /opt/tibco/be/${BE_SHORT_VERSION}/bin/
 COPY --from=intermediate /opt/tibco/be/${BE_SHORT_VERSION}/bin/*.idx /opt/tibco/be/${BE_SHORT_VERSION}/bin/
 COPY --from=intermediate /opt/tibco/be/${BE_SHORT_VERSION}/lib /opt/tibco/be/${BE_SHORT_VERSION}/lib
-
+# copy as2 related files
 COPY --from=intermediate /opt/tibco/as/${AS_SHORT_VERSION}/bin /opt/tibco/as/${AS_SHORT_VERSION}/bin
 COPY --from=intermediate /opt/tibco/as/${AS_SHORT_VERSION}/lib /opt/tibco/as/${AS_SHORT_VERSION}/lib
+# copy ftl related files
+COPY --from=intermediate /opt/tibco/ftl/${FTL_SHORT_VERSION}/lib /opt/tibco/ftl/${FTL_SHORT_VERSION}/lib
+# copy activespaces related files
+COPY --from=intermediate /opt/tibco/as/${ACTIVESPACES_SHORT_VERSION}/lib /opt/tibco/as/${ACTIVESPACES_SHORT_VERSION}/lib
 
 LABEL "TIBCO BusinessEvents Version"=$BE_PRODUCT_VERSION \
       "TIBCO BusinessEvents Docker Image Version"=$BE_PRODUCT_IMAGE_VERSION

cloud/docker/bin/Dockerfile-rms

@@ -1,4 +1,8 @@
 #
+# Copyright (c) 2019-2020. TIBCO Software Inc.
+# This file is subject to the license terms contained in the license file that is distributed with this file.
+#
+#
 # BusinessEvents Dockerfile
 #
 ARG BE_PRODUCT_VERSION
@@ -8,7 +12,7 @@ ARG AS_VERSION
 ARG JRE_VERSION
 ARG AS_SHORT_VERSION
 
-FROM ubuntu:latest as intermediate
+FROM ubuntu:20.10 as intermediate
 
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
@@ -54,7 +58,7 @@ RUN rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/aws
 RUN rm -rf /home/tibco/be/be_installers-hf
 
 #Discard intermediate image and just copy the installation to a new image.
-FROM ubuntu:latest
+FROM ubuntu:20.10
 
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
@@ -64,7 +68,6 @@ ARG AS_SHORT_VERSION
 ARG JRE_VERSION
 
 COPY --from=intermediate /home/tibco/be /home/tibco/be
-
 COPY --from=intermediate /opt/tibco/tibcojre64/${JRE_VERSION} /opt/tibco/tibcojre64/${JRE_VERSION}
 
 COPY --from=intermediate /opt/tibco/be/${BE_SHORT_VERSION}/bin/be-engine* /opt/tibco/be/${BE_SHORT_VERSION}/bin/

cloud/docker/bin/Dockerfile-rms.win

@@ -1,4 +1,8 @@
 #
+# Copyright (c) 2019-2020. TIBCO Software Inc.
+# This file is subject to the license terms contained in the license file that is distributed with this file.
+#
+#
 # TIBCO BusinessEvents RMS Dockerfile For Windows Platform - Dockerfile-rms.win
 #
 
@@ -14,6 +18,12 @@ ARG BE_PRODUCT_HOTFIX
 ARG AS_PRODUCT_HOTFIX
 ARG AS_VERSION
 ARG AS_SHORT_VERSION
+ARG FTL_VERSION
+ARG FTL_SHORT_VERSION
+ARG FTL_PRODUCT_HOTFIX
+ARG ACTIVESPACES_VERSION
+ARG ACTIVESPACES_SHORT_VERSION
+ARG ACTIVESPACES_PRODUCT_HOTFIX
 ARG DOCKERFILE_NAME
 ARG JRE_VERSION
 ARG TEMP_FOLDER
@@ -30,6 +40,10 @@ ENV \
     JRE_HOME=c:/tibco/tibcojre64/${JRE_VERSION} \
     AS_VERSION=${AS_VERSION} \
     AS_SHORT_VERSION=${AS_SHORT_VERSION} \
+    FTL_VERSION=${FTL_VERSION} \
+    FTL_SHORT_VERSION=${FTL_SHORT_VERSION} \
+    ACTIVESPACES_VERSION=${ACTIVESPACES_VERSION} \
+    ACTIVESPACES_SHORT_VERSION=${ACTIVESPACES_SHORT_VERSION} \
     BE_PRODUCT_VERSION=${BE_PRODUCT_VERSION} \
     CDD_FILE=c:/tibco/be/${BE_SHORT_VERSION}/rms/bin/RMS.cdd \
     EAR_FILE=c:/tibco/be/${BE_SHORT_VERSION}/rms/bin/RMS.ear \
@@ -56,10 +70,10 @@ RUN rmdir /S /Q "c:\working"
 VOLUME \
     "c:\mnt\tibco\be\logs" \
     "c:\mnt\tibco\be\data-store" \
-    "c:\tibco\be\${BE_SHORT_VERSION}\rms\config\notify" \
-    "c:\tibco\be\${BE_SHORT_VERSION}\rms\config\security" \
-    "c:\tibco\be\${BE_SHORT_VERSION}\rms\shared" \
-    "c:\tibco\be\${BE_SHORT_VERSION}\examples\standard\WebStudio"
+    "${BE_HOME}\rms\config\notify" \
+    "${BE_HOME}\rms\config\security" \
+    "${BE_HOME}\rms\shared" \
+    "${BE_HOME}\examples\standard\WebStudio"
 
 # The following is the list of communication ports that need to be open-n-available
 # Port 50000 is AS Listener Port, 50001 is AS Remote Listener Port, 5555 is JMX Port

cloud/docker/bin/Dockerfile-teagent

@@ -1,12 +1,16 @@
 #
+# Copyright (c) 2019-2020. TIBCO Software Inc.
+# This file is subject to the license terms contained in the license file that is distributed with this file.
+#
+#
 # BusinessEvents Dockerfile
 #
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
 ARG BE_PRODUCT_IMAGE_VERSION
 ARG JRE_VERSION
 
-FROM ubuntu:latest as intermediate
+FROM ubuntu:20.04 as intermediate
 
 ARG BE_PRODUCT_VERSION
 ARG BE_SHORT_VERSION
@@ -47,7 +51,7 @@ RUN rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/aws  \
    && rm -rf /opt/tibco/be/${BE_SHORT_VERSION}/lib/ext/tpcl/tomsawyer \
    && rm -rf /home/tibco/be/be_installers-hf
 #Discard intermediate image and just copy the installation to a new image.
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 RUN apt-get update -y \
  && apt-get upgrade python3-setuptools -y &&  apt-get install --no-install-recommends apt-transport-https curl software-properties-common gnupg-agent ca-certificates python3 python3-pip -y \
@@ -107,4 +111,4 @@ EXPOSE 5555
 
 WORKDIR /home/tibco/be
 RUN chmod +x *.py
-CMD ["./run"]
+CMD ["./run"]