Commit 5c1fe35d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza definición de puertos

See merge request redmic-project/server/oauth!6
parents ca7fe9f9 f8b6ae54

.gitlab-ci.yml

+21 −8
Original line number Diff line number Diff line
@@ -113,17 +113,22 @@ deploy-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 60

    STACK: user

    SERVICES_TO_CHECK: user_${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}

  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}

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

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -136,17 +141,22 @@ deploy-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 60

    STACK: user

    SERVICES_TO_CHECK: user_${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}

  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}

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

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -169,13 +179,16 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    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}

  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}

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

      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}

  environment:

    name: pro

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

Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ COPY /dist/*.jar ./ 


EXPOSE ${MICROSERVICE_PORT}



ENTRYPOINT java ${JAVA_OPTS} \

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

ENTRYPOINT ${JAVA_BIN} ${DEFAULT_JAVA_OPTS} ${JAVA_OPTS} \

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

docker-compose.dev.yml

+21 −3
Original line number Diff line number Diff line
@@ -2,7 +2,25 @@ version: '3.5' 


services:

  oauth:

    container_name: ${MICROSERVICE_NAME}

    restart: on-failure:3

    ports:

      - ${MICROSERVICE_PORT}:${MICROSERVICE_PORT}
 
      - 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:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M

docker-compose.prod.yml

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


services:

  oauth:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1
@@ -19,7 +17,9 @@ services: 
        condition: on-failure

        delay: 1m

        window: 3m



networks:

  traefik-net:

    external: true
 
      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M

docker-compose.tmpl.yml

+4 −1
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@ services: 
      - SPRING_PROFILES_ACTIVE

      - SPRING_DATASOURCE_USERNAME

      - SPRING_DATASOURCE_PASSWORD

      - JAVA_OPTS=-Xmx768m -Xss768m

      - JAVA_OPTS=-XX:MaxRAMFraction=1

    networks:

      - postgres-net

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health

      interval: 30s
@@ -25,3 +26,5 @@ networks: 
    external: true

  redmic-net:

    external: true

  traefik-net:

    external: true