Cleanup and tests

Author: Pogrebnyak, Sergei

.env

@@ -0,0 +1 @@
+RELEASE=10.1

.travis.yml

@@ -0,0 +1,23 @@
+sudo: required
+
+services:
+  - docker
+
+matrix:
+    - RELEASE=10.1
+#    - RELEASE=10.2
+
+before_install:
+  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+    # EMPOWER_USERNAME and EMPOWER_PASSWORD must be set in the project settings
+  - envsubst < init-$RELEASE.yaml.template > init.yaml
+
+script: 
+  - docker-compose build simple
+  - docker-compose build unmanaged managed
+  - docker images | grep msc
+  - docker-compose run --rm init
+  - docker-compose up -d managed
+  - docker-compose run --rm test
+  - docker-compose logs
+  - docker-compose down

Dockerfile.managed

@@ -1,56 +1,14 @@
-# MUST start with builder image to run provisioning using template.yaml
+ARG RELEASE=10.1
+FROM simple/msc:$RELEASE as builder
+FROM unmanaged/msc:$RELEASE as base
 
-#FROM store/softwareag/commandcentral:10.1.0.1-builder as builder
-FROM sagdevopsccdockerbuilder_simple as builder
-
-# ADOPTED from docker file created by running /opt/softwareag/IntegrationServer/docker/is_container.sh createDockerfile
-FROM centos:7
-
-ENV SAG_HOME=/opt/softwareag
-ENV JAVA_HOME $SAG_HOME/jvm/jvm/
-ENV JRE_HOME $SAG_HOME/jvm/jvm/jre/
-ENV INSTANCE_NAME=default
-
-WORKDIR $SAG_HOME
-
-COPY --from=builder $SAG_HOME/jvm/jvm/ $SAG_HOME/jvm/jvm/
-
-COPY --from=builder $SAG_HOME/install/jars/ $SAG_HOME/install/jars/
-COPY --from=builder $SAG_HOME/install/profile/ $SAG_HOME/install/profile/
-COPY --from=builder $SAG_HOME/install/products/ $SAG_HOME/install/products/
-
-COPY --from=builder $SAG_HOME/Licenses/sagosch $SAG_HOME/Licenses/sagosch
-
-COPY --from=builder $SAG_HOME/common/bin/ $SAG_HOME/common/bin/
-COPY --from=builder $SAG_HOME/common/conf/ $SAG_HOME/common/conf/
-COPY --from=builder $SAG_HOME/common/db/ $SAG_HOME/common/db/
-COPY --from=builder $SAG_HOME/common/lib/ $SAG_HOME/common/lib/
-COPY --from=builder $SAG_HOME/common/runtime/ $SAG_HOME/common/runtime/
-
-COPY --from=builder $SAG_HOME/WS-Stack/ $SAG_HOME/WS-Stack/
-
-COPY --from=builder $SAG_HOME/IntegrationServer/bin/ $SAG_HOME/IntegrationServer/bin/
-COPY --from=builder $SAG_HOME/IntegrationServer/lib/ $SAG_HOME/IntegrationServer/lib/
-COPY --from=builder $SAG_HOME/IntegrationServer/updates/ $SAG_HOME/IntegrationServer/updates/
-COPY --from=builder $SAG_HOME/IntegrationServer/.tc.dev.log4j.properties $SAG_HOME/IntegrationServer/.tc.dev.log4j.properties
-
-# instances
-COPY --from=builder $SAG_HOME/IntegrationServer/instances/ $SAG_HOME/IntegrationServer/instances/
-# profile
-COPY --from=builder $SAG_HOME/profiles/IS_${INSTANCE_NAME}/ $SAG_HOME/profiles/IS_${INSTANCE_NAME}/
-
-EXPOSE 5555 9999
-
-LABEL com.softwareag.product="IntegrationServer" \com.softwareag.product.version="10.1.0.0" \com.softwareag.webmethodscloud.primaryPort="5555"
-
-ADD *.sh $SAG_HOME/profiles/IS_$INSTANCE_NAME/bin/
-
-ENTRYPOINT $SAG_HOME/profiles/IS_$INSTANCE_NAME/bin/entrypoint.sh
+# add SPM and CLI binaries
+COPY --from=builder $SAG_HOME/profiles/SPM/ $SAG_HOME/profiles/SPM/
+COPY --from=builder $SAG_HOME/CommandCentral/client/ $SAG_HOME/CommandCentral/client/
 
-### ADD management support
+# CLI support
 ENV CC_CLI_HOME=$SAG_HOME/CommandCentral/client
 ENV PATH=$PATH:$CC_CLI_HOME/bin
-COPY --from=builder $SAG_HOME/profiles/SPM/ $SAG_HOME/profiles/SPM/
-COPY --from=builder $SAG_HOME/CommandCentral/client/ $SAG_HOME/CommandCentral/client/
+
+# SPM ports
 EXPOSE 8092 8093
-### end manage

Dockerfile.simple

@@ -1,5 +1,6 @@
 # MUST start with builder image to provision using template.yaml
-FROM store/softwareag/commandcentral:10.1.0.1-builder as builder
+ARG RELEASE=10.1
+FROM store/softwareag/commandcentral:$RELEASE-builder as builder
 
 # this is default/lazy option for building images
 

Dockerfile.unmanaged

@@ -1,8 +1,7 @@
-# MUST start with builder image to run provisioning using template.yaml
-# FROM store/softwareag/commandcentral:10.1.0.1-builder as builder
-FROM sagdevopsccdockerbuilder_simple as builder
+ARG RELEASE=10.1
+FROM simple/msc:$RELEASE as builder
 
-# ADOPTED from docker file created by running /opt/softwareag/IntegrationServer/docker/is_container.sh createDockerfile
+# ADAPTED from docker file created by running /opt/softwareag/IntegrationServer/docker/is_container.sh createDockerfile
 FROM centos:7
 
 ENV SAG_HOME=/opt/softwareag
@@ -35,13 +34,12 @@ COPY --from=builder $SAG_HOME/IntegrationServer/.tc.dev.log4j.properties $SAG_HO
 
 # instances
 COPY --from=builder $SAG_HOME/IntegrationServer/instances/ $SAG_HOME/IntegrationServer/instances/
-# profile
 COPY --from=builder $SAG_HOME/profiles/IS_${INSTANCE_NAME}/ $SAG_HOME/profiles/IS_${INSTANCE_NAME}/
 
 EXPOSE 5555 9999
 
 LABEL com.softwareag.product="IntegrationServer" \com.softwareag.product.version="10.1.0.0" \com.softwareag.webmethodscloud.primaryPort="5555"
 
-ADD *.sh $SAG_HOME/profiles/IS_$INSTANCE_NAME/bin/
+ADD *.sh $SAG_HOME/
 
-ENTRYPOINT $SAG_HOME/profiles/IS_$INSTANCE_NAME/bin/entrypoint.sh
+ENTRYPOINT $SAG_HOME/entrypoint.sh

README.md

@@ -18,10 +18,11 @@ Login to Docker with your Docker ID from your console and verify you can downloa
 
 ```bash
 docker login
-docker pull store/softwareag/commandcentral:10.1.0.1-server
+docker pull store/softwareag/commandcentral:10.1-server
 ```
 
-Modify [init.yaml](init.yaml) to configure product and fix repositories, poiting to Master 10.1 repostories on Empower using your Empower credentials or point to your local 10.1 mirrors
+Copy [init-10.1.yaml.template](init.yaml.template) into init.yaml files and modify it
+with your Empower credentials (email and password):
 
 ```yaml
   product:
@@ -36,93 +37,190 @@ Modify [init.yaml](init.yaml) to configure product and fix repositories, poiting
       password: yourpass
 ```
 
-Add your 10.1 webMethods Microservices Container license file to the current folder as ```licenseKey.xml``` file.
+For CI you can use the following method:
+
+```bash
+export RELEASE=10.1
+export EMPOWER_USERNAME=you@company.com
+export EMPOWER_PASSWORD=youpass
+envsubst < init-$RELEASE.yaml.template > init.yaml
+```
 
 ## Building images
 
-To build images using Command Central composite template run
+To build simple image using Command Central composite template run:
 
 ```bash
-docker-compose build
+docker-compose build simple
+
+...
+Successfully tagged managed/msc:10.1
 ```
 
-See [template.yaml](template.yaml) for basic webMethods Microservices Container (MSC) runtime instance definition.
+It may take up to 20 minutes to download the binaries and build the image.
+
+While it is building, check out [template.yaml](template.yaml) that is used for building
+this image with basic webMethods Microservices Container (MSC) runtime instance definition.
 
 There are 3 flavors of images:
 
 * [Simple](Dockerfile.simple) - easy way to build images
 * [Unmanaged](Dockerfile.unmanaged) - customized image without SPM management agent
 * [Managed](Dockerfile.managed) - customized image with SPM management agent
 
+Build the second and third by running:
+
+```bash
+docker-compose build unmanaged managed
+...
+Successfully tagged managed/msc:10.1
+```
+
 Check image sizes:
 
 ```bash
-docker images
+docker images | grep msc
+
+managed/msc     10.1    195596d9c020        Less than a second ago   1.56GB
+unmanaged/msc   10.1    3009317db4a8        Less than a second ago   1.52GB
+simple/msc      10.1    cfe3a4674b31        6 minutes ago            2.5GB
 ```
 
+### Simple image
+
+There is no size optimization for this image but it is the easiest to build.
+Suitable for ad-hoc testing.
+
+Simple image comes with SPM and thus can be managed in Command Central.
+
+### Unmanaged image
+
+Unmanaged image does not include management agent (SPM) and thus cannot be managed
+by Command Central, but can be managed by an orchestration tool of your choice.
+
+### Managed image
+
+Managed image includes Command Central agent (SPM) and thus:
+
+* You can monitor, administer and even configure it in Command Central
+* And still manage by an orchestration tool of your choice
+* Adds only a small overhead in terms of image size (~40mb) and a second process within the container
+
 ## Running containers
 
-Start Command Central container first
+Let run containers from the images we just built.
 
-```bash
-docker-compose run --rm init
+### Providing license file
+
+If you want the containers to run for more than 30 minutes, provide a valid Software AG license file:
+
+* Copy 10.x webMethods Microservices Container or Integration Server license to the current folder and save it as ```licenseKey.xml``` file.
+* Uncomment volume mappings for the license file in docker-compose.yml:
+
+```yaml
+    volumes:
+      - ./licenseKey.xml:/opt/softwareag/IntegrationServer/instances/default/config/licenseKey.xml
 ```
 
-Start all 3 types of containers we just built:
+If you don't have your license handy, just skip this step.
+
+### Running unmanaged containers
+
+Start unmanaged container by simply running this command:
 
 ```bash
-docker-compose up -d
+docker-compose up -d unmanaged
+
+...
+sagdevops-cc-docker-builder_cc_1 is up-to-date
+Creating sagdevops-cc-docker-builder_unmanaged_1 ... done
 ```
 
-Wait up to 2 minutes and access them as:
+Wait until container comes up.
+You can monitor the log using this command until you this ONLINE statement:
+
+```bash
+docker-compose logs -f unmanaged
+
+...
+unmanaged_1  | Integration Server is ONLINE at ...
+```
 
-* Simple - [http://0.0.0.0:5551/](http://0.0.0.0:5551/)
-* Unmanaged - [http://0.0.0.0:5552/](http://0.0.0.0:5552/)
-* Managed - [http://0.0.0.0:5553/](http://0.0.0.0:5553/)
+Stop tailing the log by pressing Ctrl+C.
 
+Open Integration Server Admin UI at [http://0.0.0.0:5552/](http://0.0.0.0:5552/)
 Login as Administrator/manage
 
-## Simple image
+Congratuations!
 
-There is no size optimization for this image but it is the easiest to build.
-Suitable for ad-hoc testing.
+This is your custom-built webMethods Microservices Runtime container for 10.1 with the latest fixes
+and basic configuration.
 
-Simple image comes with SPM and thus can be managed in Command Central.
+### Running managed containers
 
-## Unmanaged image
+To take advantage of the management capabilities privided by Command Central
+we can run managed containers.
 
-Unmanaged image does not include management agent (SPM) and thus cannot be managed
-by Command Central, but can be managed by an orchestration tool of your choice.
+Start Command Central container first:
+
+```bash
+docker-compose run --rm init
+...
+Alias   Name    Status  Url Host        Url Port        Location Id     Installation Type
+local   Local   ONLINE  localhost           8092
+The expected values were successfully retrieved after 13 calls within 181 seconds.
+```
 
-## Managed image
+Wait until the command completes.
 
-Managed image includes Command Central agent (SPM) and thus:
+Open [Command Central](https://0.0.0.0:8091/) and login as Administrator/manage.
 
-* You can monitor, administer and even configure it in Command Central
-* And still manage by an orchestration tool of your choice
+> NOTE that Command Central images comes from Docker Store. We did not build or customize it anyhow.
+
+Click on the Installations tab and notice that the list of managed installations includes only 'local' node.
 
-Open [Command Central](https://0.0.0.0:8091/) to see simple and managed containers in
+to see simple and managed containers in
 the maganed landscape.
 
-You can run tests against them using Command Central API:
+Start managed container by running:
 
 ```bash
-docker-compose run --rm test
+docker-compose up -d managed
+docker-compose logs -f managed
+
+...
+managed_1    | Registering 'msc' with Command Central server 'cc' ...
+managed_1    | 200 OK
+
+managed_1    | 2018-05-04 17:04:55 UTC [ISP.0046.0012I] Enabling HTTP Listener on port 5555
+...
+managed_1    | Integration Server is ONLINE at http://9eef625c9410:5555/
 ```
 
-Tail the logs if you need to
+Stop tailing the log by pressing Ctrl+C.
+
+Check Command Central Web UI Installations and Instances tabs and notice
+Integration Server runtime instance is automatialy discovered and registred
+within Command Central managed landscape.
+
+Open Integration Server Admin UI at [http://0.0.0.0:5553/](http://0.0.0.0:5553/)
+Login as Administrator/manage
+
+Run simple smoke tests against managed containers using Command Central API:
 
 ```bash
-docker-compose logs -f
+docker-compose run --rm test
 ```
 
+See 'test' container command in docker-compose.yml for details.
+
 ## Cleanup
 
 ```bash
 docker-compose down
 ```
 
-## Adoping templates to work with Command Central Docker Builder 10.1
+## Adapting templates to work with Command Central Docker Builder 10.1
 
 > Command Central Docker Builder 10.1 has the following requirements for the template.yaml:
 
@@ -133,7 +231,7 @@ docker-compose down
 
 See the difference between [adopted template.yaml](template.yaml) and [original template.yaml](https://github.com/SoftwareAG/sagdevops-templates/blob/master/templates/sag-msc-server/template.yaml) for MSC basic template.
 
-> The above limitations are planned to be removed in the upcoming Command Central Builder release to allow seamless use of the same templates for VMs and containers
+> The above limitations will be removed removed in the upcoming releases of Command Central Builder 10.2 to allow seamless use of the same templates for VMs and containers
 
 ## Troubleshooting