OCP-DEMO Add docker layer with Infinispan server task

Author: fax4ever

openshift/message-board/.gitignore

@@ -42,4 +42,5 @@ script/nocontent
 script/account-service
 script/message-service
 script/message-board-web
+script/CUSTOM_INFINISPAN_IMAGE
 !*sh

openshift/message-board/README.asciidoc

@@ -16,12 +16,18 @@ Made with Hibernate ORM, Hibernate OGM and Infinispan for OpenShift Container Pl
 mvn clean install
 ----
 
+## Deploy Infinispan custom Docker image
+----
+cd script
+sh ./add-custom-infinispan-image.sh
+----
+
 ## Install demo
 ----
 cd script
 
-oc login -u [YOUR-USER-NAME]
-oc new-project [YOUR-PROJECT-NAME]
+( oc login -u [YOUR-USER-NAME] ) <<optional>>
+( oc new-project [YOUR-PROJECT-NAME] ) <<optional>>
 
 sh ./install-all.sh
 ----
@@ -38,6 +44,12 @@ cd script
 sh ./binary-build-message.sh
 ----
 
+## Update Web App
+----
+cd script
+sh ./binary-build-web.sh
+----
+
 ## Test
 
 ### Web [FORM]

openshift/message-board/extra/message-server-task/Dockerfile

@@ -0,0 +1,4 @@
+FROM jboss/infinispan-server:9.3.0.Final
+
+# add Docker layer with the server task
+COPY ./target/message-server-task.jar /opt/jboss/infinispan-server/standalone/deployments

openshift/message-board/script/install-all.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -x
 set -e
 
 # Copy bundles for the binary builds
@@ -10,7 +11,8 @@ oc create -f ../template/infinispan-persistent.json
 oc import-image openshift/wildfly-130-centos7 --confirm
 
 # Install Infinispan Server
-oc new-app --template=infinispan-persistent
+CUSTOM_INFINISPAN_IMAGE=`cat CUSTOM_INFINISPAN_IMAGE`
+oc new-app --template=infinispan-persistent -p IMAGE="$CUSTOM_INFINISPAN_IMAGE"
 oc delete route infinispan-persistent-app-management
 
 # Install MySql Server

openshift/message-board/script/install-custom-infinispan-image.sh

@@ -0,0 +1,31 @@
+# Creates custom Infinispan image and deploy it to OpenShift docker registry,
+# this code is inspired by the project https://github.com/jboss-dockerfiles/infinispan
+
+#!/usr/bin/env bash
+set -x
+set -e
+
+# add developer the ability to push a image
+oc login -u system:admin
+oc adm policy add-role-to-user system:registry developer
+oc adm policy add-role-to-user admin developer -n myproject
+oc adm policy add-role-to-user system:image-builder developer
+
+# take OpenShift Docker registry IP
+oc project default
+REGISTRY_IP=`oc get svc/docker-registry -o yaml | grep clusterIP: | awk '{print $2}'`
+
+# build image
+IMAGE="${REGISTRY_IP}:5000/myproject/infinispan-with-board-task"
+docker build --no-cache --force-rm -t $IMAGE ../extra/message-server-task
+
+# push the image from local Docker repo to the OCP Docker repo
+# we need a regular user to login to the OpenShift Docker registry
+oc login -u developer -p developer
+docker login -u $(oc whoami) -p $(oc whoami -t) ${REGISTRY_IP}:5000
+docker push ${IMAGE}
+
+# store the image reference to file
+# it will be used by the install-all script
+rm ./CUSTOM_INFINISPAN_IMAGE
+echo "$IMAGE" >> CUSTOM_INFINISPAN_IMAGE