Merge pull request #250 from OpenHistoricalMap/staging

CGIMAP and Apache liveness Probe

images/web/Dockerfile

@@ -110,5 +110,6 @@ RUN chown -R www-data: $workdir
 ADD config/settings.yml $workdir/config/
 
 COPY start.sh $workdir/
+COPY liveness.sh $workdir/
 
 CMD $workdir/start.sh

images/web/liveness.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# This is a script for the complex evaluation of whether Apache or other processes are running in the container.
+check_process() {
+    if ps aux | grep "$1" | grep -v grep > /dev/null; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Check for openstreetmap-cgimap process
+check_process "/usr/local/bin/openstreetmap-cgimap"
+cgimap_status=$?
+
+# Check for apache2 process
+check_process "apache2"
+apache_status=$?
+
+# Evaluate results
+if [ $cgimap_status -eq 0 ] && [ $apache_status -eq 0 ]; then
+    echo "Both openstreetmap-cgimap and apache2 are running."
+    exit 0
+else
+    echo "One or both processes are not running!" 1>&2
+    exit 1
+fi

ohm/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
 - name: osm-seed
-  version: '0.1.0-n815.hccedaed'
+  version: '0.1.0-n816.ha1443d4'
   repository: https://devseed.com/osm-seed-chart/

values.production.template.yaml

@@ -122,7 +122,7 @@ osm-seed:
       maxReplicas: 10
       cpuUtilization: 80
     sharedMemorySize: 512Mi
-
+    livenessProbeExec: true
   # ====================================================================================================
   # Variables for memcached. Memcached is used to store session cookies
   # ====================================================================================================

values.staging.template.yaml

@@ -90,6 +90,7 @@ osm-seed:
           memory: "10Gi"
           cpu: "5"
       sharedMemorySize: 256Mi
+      livenessProbeExec: true
     # ====================================================================================================
     # Variables for osm-seed website
     # ====================================================================================================