Commit 84a5aade authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-updateServiceLabels' into 'dev' 

Actualiza etiquetas a traefik v2

See merge request redmic-project/server/atlas!7
parents e7faabd0 5d210629

.gitlab-ci.yml

+0 −8
Original line number Diff line number Diff line
@@ -126,11 +126,3 @@ maven-build-view: 
.deploy:

  variables:

    STACK: atlas
 


.deploy-commands:

  environment:

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



.deploy-view:

  environment:

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

atlas-commands/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>es.redmic.atlas</groupId>

		<artifactId>atlas</artifactId>

		<version>0.3.0</version>

		<version>0.3.0-feature-updateServiceLabels</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

atlas-commands/src/main/java/es/redmic/atlascommands/config/Oauth2SecurityConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class Oauth2SecurityConfiguration { 
			// @formatter:off



			http.cors().and().anonymous().and().authorizeRequests()

				.antMatchers(HttpMethod.GET, "/actuator/**").permitAll();

				.antMatchers("/actuator/**").permitAll();



			http.authorizeRequests()

				.antMatchers(HttpMethod.POST, "/discover-layers/**").permitAll();

atlas-lib/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>es.redmic.atlas</groupId>

		<artifactId>atlas</artifactId>

		<version>0.3.0</version>

		<version>0.3.0-feature-updateServiceLabels</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

atlas-view/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>es.redmic.atlas</groupId>

		<artifactId>atlas</artifactId>

		<version>0.3.0</version>

		<version>0.3.0-feature-updateServiceLabels</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>