Commit e6323f42 authored by Noel Alonso's avatar Noel Alonso
Browse files

Revert "Recupera disable de healthcheck corregido" 

This reverts commit a5f06bd9.
parent a5f06bd9

deploy/.env

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS=0.1 
GEOSERVER_NODE_RESOURCES_LIMITS_CPUS=1

GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS=0.1



GEOSERVER_HEALTHCHECK_TEST=curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null -u '${GEOSERVER_ADMIN_USER}:${GEOSERVER_ADMIN_PASSWORD}' http://localhost:${GEOSERVER_PORT}${GEOSERVER_HEALTH_PATH}



POSTGRES_GWC_WORK_MEM=16MB

POSTGRES_GWC_MAX_WAL_SIZE=256MB

POSTGRES_USER=geowebcache

deploy/compose.tmpl.yaml

+2 −16
Original line number Diff line number Diff line
@@ -10,15 +10,7 @@ x-geoserver-root: &geoserver-root 
    - footprints-vol:${FOOTPRINTS_DATA_DIR}

    - cache-vol:${GEOWEBCACHE_CACHE_DIR}

  healthcheck:

    test: |

      if [ ${GEOSERVER_HEALTHCHECK_DISABLE:-0} -ne 0 ]

      then

        :

      else

        curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null \

        -u '${GEOSERVER_ADMIN_USER}:${GEOSERVER_ADMIN_PASSWORD}' \

        http://localhost:${GEOSERVER_PORT}${GEOSERVER_HEALTH_PATH}

      fi

    test: ${GEOSERVER_HEALTHCHECK_TEST}

    interval: ${GEOSERVER_HEALTHCHECK_INTERVAL:-30s}

    timeout: ${GEOSERVER_HEALTHCHECK_TIMEOUT:-15s}

    retries: ${GEOSERVER_HEALTHCHECK_RETRIES:-5}
@@ -145,13 +137,7 @@ services: 
      - postgres-data-vol:${PGDATA}

      - wal-vol:${POSTGRES_INITDB_WALDIR}

    healthcheck:

      test: |

        if [ ${POSTGRES_HEALTHCHECK_DISABLE:-0} -ne 0 ]

        then

          :

        else

          pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}

        fi

      test: ${POSTGRES_HEALTHCHECK_TEST:-pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}}

      interval: ${POSTGRES_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${POSTGRES_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${POSTGRES_HEALTHCHECK_RETRIES:-5}