Add mp health build arg

Signed-off-by: Adam Wisniewski <[email protected]>

Author: awisniew90

build.sh

@@ -28,12 +28,12 @@ STACK_IMAGE="${STACK_IMAGE:-openliberty/application-stack:0.4}"
 #
 # URL at which your outer loop Dockerfile is hosted
 #
-DEVFILE_DOCKERFILE_LOC="${DEVFILE_DOCKERFILE_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.4.1/Dockerfile}"
+DEVFILE_DOCKERFILE_LOC="${DEVFILE_DOCKERFILE_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.5.0/Dockerfile}"
 
 #
 # URL at which your outer loop deploy YAML template is hosted
 #
-DEVFILE_DEPLOY_YAML_LOC="${DEVFILE_DEPLOY_YAML_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.4.1/app-deploy.yaml}"
+DEVFILE_DEPLOY_YAML_LOC="${DEVFILE_DEPLOY_YAML_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.5.0/app-deploy.yaml}"
 
 # Generates application stack artifacts.
 generate() {

templates/outer-loop/Dockerfile

@@ -42,16 +42,25 @@ COPY --from=compile --chown=1001:0 /work/config/ /config/
 
 # 2d) Add the microprofile health feature configuration if it is not already defined in the user's configuration.
 #     This allows k8s to use the deployment's health probes.
-COPY --from=compile --chown=1001:0 /stack/ol/config/configDropins/defaults/liberty-stack-mpHealth.xml /config/configDropins/defaults
-RUN for FILE in /config/*.xml; do \
-        if cat $FILE | sed '/<!--.*-->/d' | sed '/<!--/,/-->/d' \
-        | grep -q '<feature>\s*mpHealth-[0-9]*.[0-9]*\s*</feature>\|<feature>\s*microProfile-[0-9]*.[0-9]*\s*</feature>'; then \
-            rm /config/configDropins/defaults/liberty-stack-mpHealth.xml; \
+RUN mkdir -p /tmp/stack/config/configDropins/defaults
+COPY --from=compile --chown=1001:0 /stack/ol/config/configDropins/defaults/ /tmp/stack/config/configDropins/defaults/
+
+ARG ADD_MP_HEALTH=true
+RUN if [ "$ADD_MP_HEALTH" = "true" ]; then \
+        /opt/ol/wlp/bin/server start; \
+        /opt/ol/wlp/bin/server stop; \
+        if ! grep "CWWKF0012I" /logs/messages.log | grep -q 'mpHealth-[0-9]*.[0-9]*\|microProfile-[0-9]*.[0-9]*'; then \
+            echo "Missing mpHealth feature - adding config snippet"; \
+            cp /tmp/stack/config/configDropins/defaults/liberty-stack-mpHealth.xml /config/configDropins/overrides; \
+        else \
+            echo "Found mpHealth feature - not adding config snippet"; \
         fi; \
-    done
+        rm -rf /logs/*; \
+    elif [ "$ADD_MP_HEALTH" != "false" ]; then \
+        echo "Invalid ADD_MP_HEALTH value: $ADD_MP_HEALTH. Valid values are \"true\" | \"false\" "; \
+    fi
 
-# This Dockerfile uses the Open Liberty "full" image. If this is changed to use the Open Liberty kernel-slim image, uncomment the line below to install all necessary features. 
-# RUN features.sh
+RUN rm -rf /tmp/stack
 
 # 2e) Copy the application binary
 COPY --from=compile --chown=1001:0 /work/outer-loop-app/target/*.[ew]ar /config/apps