Commit ac34a224 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza base, limita recursos y transforma dev 

Se prepara para maximizar el uso de memoria para la pila de Java,
controlando los límites desde las restricciones de Docker.
Aprovecha para limitar los contenedores y para transformar el entorno
de desarrollo en un Docker Swarm, con servicios clusterizados (como
en producción).
parent 6671ad8a

.gitlab-ci.yml

+41 −17
Original line number Diff line number Diff line
@@ -171,16 +171,21 @@ deploy-commands-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-commands

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
@@ -193,17 +198,22 @@ deploy-view-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-view

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}

      ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
@@ -216,16 +226,21 @@ deploy-commands-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-commands

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
@@ -242,17 +257,22 @@ deploy-view-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-view

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}

      ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
@@ -269,19 +289,21 @@ deploy-commands-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STATUS_CHECK_DELAY: 120

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    SERVICE: ${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=prod OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: pro/${CI_PROJECT_NAME}-commands

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
@@ -295,20 +317,22 @@ deploy-view-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STATUS_CHECK_DELAY: 120

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    SERVICE: ${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=prod OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET}

      ELASTIC_XPACKSECURITYUSER=${PRO_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: pro/${CI_PROJECT_NAME}-view

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

Dockerfile

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ ARG PARENT_IMAGE_TAG 


FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



ENV SERVICE=undefined-service



COPY /*/dist/*.jar ./



EXPOSE ${COMMANDS_PORT} ${VIEW_PORT}
 


ENTRYPOINT java ${JAVA_OPTS} \

	-Djava.security.egd=file:/dev/./urandom \

	-jar ${DIRPATH}/${SERVICE}.jar

docker-compose.vessels-commands.dev.yml

+20 −3
Original line number Diff line number Diff line
@@ -2,10 +2,27 @@ version: '3.5' 


services:

  vessels-commands:

    container_name: ${UNIT_NAME}-commands

    restart: on-failure:3

    ports:

      - ${COMMANDS_PORT}:${COMMANDS_PORT}

      - target: ${COMMANDS_PORT}

        published: ${COMMANDS_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${COMMANDS_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/commands

        traefik.backend: ${UNIT_NAME}-commands

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  commands-vol:

docker-compose.vessels-commands.prod.yml

+6 −7
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ version: '3.5' 


services:

  vessels-commands:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1
@@ -16,13 +14,14 @@ services: 
        constraints:

          - node.role == worker

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m



networks:

  traefik-net:

    external: true

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  commands-vol:

docker-compose.vessels-commands.tmpl.yml

+7 −2
Original line number Diff line number Diff line
@@ -5,14 +5,15 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - COMMANDS_PORT

      - SERVICE

      - SPRING_PROFILES_ACTIVE

      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - JAVA_OPTS=-Xmx768m -Xss768m

      - MICROSERVICE_NAME=${UNIT_NAME}-commands

      - JAVA_OPTS=-XX:MaxRAMFraction=1

    networks:

      - kafka-net

      - redmic-net

      - traefik-net

    volumes:

      - commands-vol:/tmp/kafka

    healthcheck:
@@ -25,5 +26,9 @@ services: 
networks:

  kafka-net:

    external: true



  redmic-net:

    external: true



  traefik-net:

    external: true