Commit 9c35960e authored by Eric D. Schabell's avatar Eric D. Schabell

Merge branch 'erics_crcupdates' into 'master'

Updated docs and images.

See merge request !3
parents 2c3b1d6f f817f522
......@@ -108,9 +108,5 @@ See the tagged releases for the following versions of the product:
![Cloud Pod](https://gitlab.com/redhatdemocentral/rhcs-rewards-demo/raw/master/docs/demo-images/rhcs-rewards-pod.png)
![Cloud Build](https://gitlab.com/redhatdemocentral/rhcs-rewards-demo/raw/master/docs/demo-images/rhcs-rewards-build.png)
[![Video Rewards Run](https://gitlab.com/eschabell/erics-images/raw/master/brms_bpms_workshop/image309.png)](http://vimeo.com/ericschabell/bpms-hr-employee-rewards-demo-run)
![Cloud Suite](https://gitlab.com/redhatdemocentral/rhcs-rewards-demo/raw/master/docs/demo-images/rhcs-arch.png)
![Cloud Build](https://gitlab.com/redhatdemocentral/rhcs-rewards-demo/raw/master/docs/demo-images/process-designer.png)
docs/demo-images/login.png

471 KB | W: | H:

docs/demo-images/login.png

272 KB | W: | H:

docs/demo-images/login.png
docs/demo-images/login.png
docs/demo-images/login.png
docs/demo-images/login.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -247,3 +247,43 @@ echo =
echo =================================================================================
echo.
GOTO :EOF
:validateIP ipAddress [returnVariable]
setlocal
set "_return=1"
echo %~1^| findstr /b /e /r "[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*" >nul
if not errorlevel 1 for /f "tokens=1-4 delims=." %%a in ("%~1") do (
if %%a gtr 0 if %%a lss 255 if %%b leq 255 if %%c leq 255 if %%d gtr 0 if %%d leq 254 set "_return=0"
)
:endValidateIP
endlocal & ( if not "%~2"=="" set "%~2=%_return%" ) & exit /b %_return%
:printDocs
echo The default option is to run this using Code Ready Containers, an OpenShift Container
echo Platform for your local machine. This host has been set by default in the variables at
echo the top of this script. You can modify if needed for your own host and ports by mofifying
echo these variables:
echo.
echo HOST_IP=api.crc.testing
echo HOST_PORT=6443
echo.
echo It's also possible to install this project on any available OpenShift installation, just point
echo this installer at your installation by passing an IP address of the hosting cluster:
echo.
echo $ init.bat IP
echo.
echo IP could look like: 192.168.99.100
echo.
echo Both methodes are validated by the install scripts.
echo.
......@@ -19,14 +19,23 @@ OCP_APP=rhcs-rewards-demo
# prints the documentation for this script.
function print_docs()
{
echo "This project can be installed on any OpenShift platform, such as the OpenShift Container"
echo "Platform (OCP). It is possible to install it on any available installation, just point"
echo "this installer at your installation by passing an IP of your OpenShift installation:"
echo "The default option is to run this using Code Ready Containers, an OpenShift Container"
echo "Platform for your local machine. This host has been set by default in the variables at"
echo "the top of this script. You can modify if needed for your own host and ports by mofifying"
echo "these variables:"
echo
echo " HOST_IP=api.crc.testing"
echo " HOST_PORT=6443"
echo
echo "It's also possible to install this project on any available OpenShift installation, just point"
echo "this installer at your installation by passing an IP address of the hosting cluster:"
echo
echo " $ ./init.sh IP"
echo
echo "IP could look like: 192.168.99.100"
echo
echo "Both methodes are validated by the install scripts."
echo
}
# check for a valid passed IP address.
......@@ -93,50 +102,43 @@ echo "## ##"
echo "###################################################################"
echo
# check host port.
if [ -z ${HOST_PORT} ]; then
# empty port variable.
echo "Please update the HOST_PORT variable located at top of this script, it's currently empty."
echo
fi
# validate OpenShift host IP.
if [ -z ${HOST_IP} ]; then
# no host name set yet.
echo "No host name set in variable HOST_IP variable located at top of this script."
echo
# check for passed target IP.
if [ $# -eq 1 ]; then
echo "Checking for host ip passed as command line variable."
echo
if [ $# -eq 1 ]; then
if valid_ip "$1" || [ "$1" == "$HOST_IP" ]; then
echo "OpenShift host given is a valid IP..."
HOST_IP=$1
echo
echo "Proceeding with OpenShift host: $HOST_IP..."
echo
else
# bad argument passed.
echo "Please provide a valid IP that points to an OpenShift installation..."
echo
print_docs
echo
exit
fi
elif [ $# -gt 1 ]; then
print_docs
if valid_ip "$1" || [ "$1" == "$HOST_IP" ]; then
echo "OpenShift host given is a valid IP..."
HOST_IP=$1
echo
echo "Proceeding with OpenShift host: $HOST_IP..."
echo
exit
else
# no arguments, prodeed with default host.
# bad argument passed.
echo "Please provide a valid IP that points to an OpenShift installation..."
echo
print_docs
echo
exit
fi
else
# host ip set, echo and proceed with hostname.
echo "You've manually set HOST to '${HOST_IP}' so we'll use that for your OpenShift Container Platform target."
elif [ $# -gt 1 ]; then
print_docs
echo
exit
elif [ $# -eq 0 ]; then
# validate HOST_IP.
if [ -z ${HOST_IP} ]; then
# no host name set yet.
echo "No host name set in HOST_IP..."
echo
print_docs
echo
exit
else
# host ip set, echo and proceed with hostname.
echo "You've manually set HOST to '${HOST_IP}' so we'll use that for your OpenShift Container Platform target."
echo
fi
fi
# make some checks first before proceeding.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment