Commit 8308b752 authored by Noel Alonso's avatar Noel Alonso
Browse files

Actualiza configuración de despliegue

parent 7a464b42

.gitlab-ci.yml

+17 −17
Original line number Diff line number Diff line
@@ -11,33 +11,33 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'



stages:

  - build

  - license-list

  - pre-package

  - package

  - test-package

  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: socket



.docker-build:

  variables:

    DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}

    DBLD_PARENT_IMAGE_TAG: ${REDMIC_SERVER_IMAGE_TAG}



.maven-build:

  variables:

    LOGGING_LEVEL_ROOT: error

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

  DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}

  STACK: socket



.deploy:

  script:

    - >

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

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

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  variables:

    STACK: ${PROJECT_PARENT_NAME}

  environment:

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


.deploy-development:

  variables:

    SPRING_PROFILES_ACTIVE: pre



.deploy-production:

  variables:

    SPRING_PROFILES_ACTIVE: prod

Dockerfile

+8 −2
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME

ARG PARENT_IMAGE_TAG

ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

ARG PARENT_IMAGE_TAG=latest



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /dist/*.jar ./



ARG MICROSERVICE_NAME=socket

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}



ARG MICROSERVICE_PORT=8089

ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${MICROSERVICE_PORT}

deploy/.env

+3 −0
Original line number Diff line number Diff line 
PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

PARENT_IMAGE_TAG=latest



MICROSERVICE_NAME=socket

MICROSERVICE_PORT=8089

deploy/docker-compose.dev.yml

+2 −4
Original line number Diff line number Diff line
@@ -2,7 +2,5 @@ version: '3.5' 


services:

  socket:

    ports:

      - target: ${MICROSERVICE_PORT}

        published: ${MICROSERVICE_PORT}

        mode: host
 
    environment:

      SPRING_PROFILES_ACTIVE: pre

deploy/docker-compose.prod.yml

+2 −4
Original line number Diff line number Diff line
@@ -2,7 +2,5 @@ version: '3.5' 


services:

  socket:

    deploy:

      placement:

        constraints:

          - node.role == worker
 
    environment:

      SPRING_PROFILES_ACTIVE: prod