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

Merge branch 'dev' into 'master' 

Actualiza base, limita recursos y transforma dev

See merge request redmic-project/server/db2es!13
parents 2b41e1af 0433df01

.gitlab-ci.yml

+34 −19
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ docker-tag-already-built-image: 
    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:

container-scanning:

  stage: test-package

  image: docker:stable

  variables:
@@ -114,20 +114,25 @@ deploy-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    SPRING_DATASOURCE_USERNAME: ${DEV_SPRING_DATASOURCE_USERNAME}

    SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD}

    JOBS_DATASOURCE_USERNAME: ${DEV_JOBS_DATASOURCE_USERNAME}

    JOBS_DATASOURCE_PASSWORD: ${DEV_JOBS_DATASOURCE_PASSWORD}

    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 SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

      JOBS_DATASOURCE_USERNAME=${DEV_JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${DEV_JOBS_DATASOURCE_PASSWORD}

      ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -141,20 +146,25 @@ deploy-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    SPRING_DATASOURCE_USERNAME: ${DEV_SPRING_DATASOURCE_USERNAME}

    SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD}

    JOBS_DATASOURCE_USERNAME: ${DEV_JOBS_DATASOURCE_USERNAME}

    JOBS_DATASOURCE_PASSWORD: ${DEV_JOBS_DATASOURCE_PASSWORD}

    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 SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD}

      JOBS_DATASOURCE_USERNAME=${DEV_JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${DEV_JOBS_DATASOURCE_PASSWORD}

      ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -171,20 +181,25 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    SPRING_DATASOURCE_USERNAME: ${PRO_SPRING_DATASOURCE_USERNAME}

    SPRING_DATASOURCE_PASSWORD: ${PRO_SPRING_DATASOURCE_PASSWORD}

    JOBS_DATASOURCE_USERNAME: ${PRO_JOBS_DATASOURCE_USERNAME}

    JOBS_DATASOURCE_PASSWORD: ${PRO_JOBS_DATASOURCE_PASSWORD}

    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 SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD}

      JOBS_DATASOURCE_USERNAME=${PRO_JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${PRO_JOBS_DATASOURCE_PASSWORD}

      ELASTIC_XPACKSECURITYUSER=${PRO_ELASTIC_XPACKSECURITYUSER}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

  environment:

    name: pro

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

Dockerfile

+0 −4
Original line number Diff line number Diff line
@@ -6,7 +6,3 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG} 
COPY /dist/*.jar ./



EXPOSE ${MICROSERVICE_PORT}
 


ENTRYPOINT java ${JAVA_OPTS} \

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

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

.env→deploy/.env

+0 −1
Original line number Diff line number Diff line 
MICROSERVICE_NAME=db2es

MICROSERVICE_PORT=8085
 
DESIRED_WORKER_ID=1

deploy/docker-compose.dev.yml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  db2es:

    ports:

      - target: ${MICROSERVICE_PORT}

        published: ${MICROSERVICE_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}

        traefik.backend: ${MICROSERVICE_NAME}

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M

docker-compose.prod.yml→deploy/docker-compose.prod.yml

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


services:

  db2es:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1
@@ -15,11 +13,12 @@ services: 
      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == ${DESIRED_WORKER_ID}

      restart_policy:

        condition: on-failure

        max_attempts: 3



networks:

  traefik-net:

    external: true
 
        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M