Commit 790e860e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Limpia CI y restos, ajusta memoria y healthcheck

See merge request redmic-project/confluent/kafka-rest!2
parents ae36a809 8d860c05

.dockerignore

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
*

!scripts

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: confluent



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
 
    STACK: confluent

deploy/docker-compose.tmpl.yml

+4 −4
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ services: 
    networks:

      kafka-net:

    healthcheck:

      test: curl -X GET http://localhost:${KR_PORT}/topics

      test: curl -s -o /dev/null http://localhost:${KR_PORT}/

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-30s}

      retries: ${HEALTHCHECK_RETRIES:-3}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

      start_period: ${HEALTHCHECK_START_PERIOD:-1m}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}
@@ -32,10 +32,10 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-205M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-256M}



networks:

  kafka-net:

README.md

+1 −1

File changed.

Contains only whitespace changes.