Commit 40d27101 authored by CarlosGC1989's avatar CarlosGC1989
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

parents 2b02664d 1e66c039

.gitlab-ci.yml

+6 −6
Original line number Diff line number Diff line
@@ -193,14 +193,14 @@ deploy-dev: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://appdev.${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

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

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -219,14 +219,14 @@ deploy-supporting-branch: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    OAUTH_URL: ${DEV_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://appdev.${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

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

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -276,14 +276,14 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

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

    OAUTH_URL: ${PRO_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: https://${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

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

      OAUTH_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

app/exposure.js

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ var express = require('express'), 
	request = require('request');



var logger, params, version,

	publicHostname = process.env.PUBLIC_HOSTNAME,

	oauthUrl = process.env.OAUTH_URL,

	oauthClientSecret = process.env.OAUTH_CLIENT_SECRET;



function getLang(req) {
@@ -100,7 +100,7 @@ function onOauthTokenRequest(req, res) { 
		clientCredentials = clientId + ':' + oauthClientSecret,

		base64ClientCredentials = Buffer.from(clientCredentials).toString('base64'),



		url = publicHostname + '/api/oauth/token',

		url = oauthUrl + '/api/oauth/token',

		authorization = 'Basic ' + base64ClientCredentials,

		bodyData = "grant_type=password&username=" + username + "&password=" + password + "&scope=write",

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ services: 
    networks:

      - redmic-net

    environment:

      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

      - PUBLIC_HOSTNAME

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${WEB_PORT}

      interval: 30s