Commit 4e93a880 authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia oauth image name para la construcción

parent 6abfdcb1

.gitlab-ci.yml

+2 −7
Original line number Diff line number Diff line
@@ -23,17 +23,13 @@ stages: 
  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: user



.maven-build:

  variables:

    POSTGRES_IMAGE_TAG: 10.13-alpine

    POSTGRES_DB: redmic

    POSTGRES_USER: postgres

    POSTGRES_PASSWORD: password

    PGPASSWORD: ${POSTGRES_PASSWORD}

    OAUTH_IMAGE_NAME: registry.gitlab.com/redmic-project/server/oauth

    OAUTH_IMAGE_NAME: registry.gitlab.com/redmic-project/server/oauth/master

    OAUTH_IMAGE_TAG: latest

    DIND_IMAGE_NAME: docker

    DIND_IMAGE_TAG: dind
@@ -117,7 +113,6 @@ variables: 


.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: user

  environment:

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

src/main/java/es/redmic/user/config/CorsConfiguration.java

+20 −0
Original line number Diff line number Diff line 
package es.redmic.user.config;



/*-

 * #%L

 * User

 * %%

 * Copyright (C) 2019 - 2020 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import org.springframework.context.annotation.Configuration;

import org.springframework.web.servlet.config.annotation.CorsRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;