Commit a48af00a authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/server/tasks into dev

parents 84e81979 b4629432

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ deploy-dev: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -143,9 +144,10 @@ deploy-dev: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

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

  only:

    - dev
@@ -169,6 +171,7 @@ deploy-supporting-branch: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -178,9 +181,10 @@ deploy-supporting-branch: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

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

  only:

    - branches

  except:
@@ -208,6 +212,7 @@ deploy-pro: 
    AWS_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${PRO_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -217,6 +222,7 @@ deploy-pro: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}

      JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

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

deploy/docker-compose.tmpl.yml

+3 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ services: 
      - mediastorage-private-vol:/data/MEDIA_STORAGE

      - mediastorage-public-vol:/data/PUBLIC_MEDIA_STORAGE

    healthcheck:

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

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

      interval: 30s

      timeout: 10s

      retries: 3
@@ -34,10 +34,9 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

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

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

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

      restart_policy:

        delay: 1m

        window: 3m