Merge branch '2024Q2_RC' into 'develop' (5b1cc8d2) · Commits · OSL / code / org.etsi.osl.main

.gitlab-ci.yml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3,11 +3,11 @@ include:

	- local: ci-templates/build.yml		- local: ci-templates/build.yml
	rules:		rules:
	- if: '$CI_COMMIT_REF_NAME == "main" \|\| $CI_COMMIT_REF_NAME == "develop"'		- if: '$CI_COMMIT_REF_NAME == "main" \|\| $CI_COMMIT_REF_NAME == "develop" \|\| $CI_COMMIT_REF_PROTECTED'

	- local: ci-templates/build_unprotected.yml		- local: ci-templates/build_unprotected.yml
	rules:		rules:
	- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'


	maven_build:		maven_build:

ci-templates/default.yml

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6,8 +6,6 @@ stages:
	- security		- security

	.default:		.default:
	variables:
	DEFAULT_VERSION: "1.0.0-SNAPSHOT"
	before_script:		before_script:
	- \|		- \|
	if [ "$CI_COMMIT_REF_NAME" = "main" ] && [ -n "$CI_COMMIT_TAG" ]; then		if [ "$CI_COMMIT_REF_NAME" = "main" ] && [ -n "$CI_COMMIT_TAG" ]; then
	@@ -15,5 +13,5 @@ stages:
	elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then		elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then
	export APP_VERSION="develop"		export APP_VERSION="develop"
	else		else
	export APP_VERSION=$DEFAULT_VERSION		export APP_VERSION=$CI_COMMIT_REF_NAME
	fi		fi

compose/docker-compose.yaml.configure

+26 −15

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,7 @@ services:
	"spring.activemq.user": "artemis",		"spring.activemq.user": "artemis",
	"spring.activemq.password": "artemis",		"spring.activemq.password": "artemis",
	"logging.level.org.springframework" : "INFO",		"logging.level.org.springframework" : "INFO",
			"logging.level.org.etsi.osl.portal.api": "INFO",
	"spring.portal.main.domain": "http://localhost",		"spring.portal.main.domain": "http://localhost",
	"spring.portal.portal.title": "Openslice",		"spring.portal.portal.title": "Openslice",
	"server.forward-headers-strategy":"FRAMEWORK"		"server.forward-headers-strategy":"FRAMEWORK"
	@@ -205,6 +206,7 @@ services:
	"spring.activemq.user": "artemis",		"spring.activemq.user": "artemis",
	"spring.activemq.password": "artemis",		"spring.activemq.password": "artemis",
	"logging.level.org.springframework" : "INFO",		"logging.level.org.springframework" : "INFO",
			"logging.level.org.etsi.osl.tmf.api" : "INFO",
	"kroki.serverurl" : "http://localhost/kroki",		"kroki.serverurl" : "http://localhost/kroki",
	"server.forward-headers-strategy":"FRAMEWORK"		"server.forward-headers-strategy":"FRAMEWORK"
	}'		}'
	@@ -234,14 +236,13 @@ services:
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop		image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
			"spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
	"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
	"spring.activemq.user": "artemis",		"spring.activemq.user": "artemis",
	"spring.activemq.password": "artemis",		"spring.activemq.password": "artemis",
	"logging.level.org.springframework" : "INFO",		"logging.level.org.springframework" : "INFO",
	"logging.level.org.etsi.osl.osom" : "INFO"		"logging.level.org.etsi.osl.osom" : "INFO"
	}'		}'
	volumes:
	- ./repo:/root
	ports:		ports:
	- 13100:13100		- 13100:13100
	networks:		networks:
	@@ -280,6 +281,11 @@ services:
	"logging.level.org.springframework" : "INFO",		"logging.level.org.springframework" : "INFO",
	"server.forward-headers-strategy":"FRAMEWORK"		"server.forward-headers-strategy":"FRAMEWORK"
	}'		}'
			logging:
			driver: "json-file"
			options:
			max-size: "500m"
			max-file: "3"
	volumes:		volumes:
	- ./repo:/root		- ./repo:/root
	ports:		ports:
	@@ -304,6 +310,11 @@ services:
	"logging.level.org.springframework" : "INFO",		"logging.level.org.springframework" : "INFO",
	"logging.level.org.etsi.osl.cridge" : "INFO"		"logging.level.org.etsi.osl.cridge" : "INFO"
	}'		}'
			logging:
			driver: "json-file"
			options:
			max-size: "800m"
			max-file: "3"
	networks:		networks:
	- front		- front
	- back		- back

compose/keycloak-init/realm-export.json

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5,9 +5,9 @@
	"notBefore": 1586721661,		"notBefore": 1586721661,
	"revokeRefreshToken": false,		"revokeRefreshToken": false,
	"refreshTokenMaxReuse": 0,		"refreshTokenMaxReuse": 0,
	"accessTokenLifespan": 300,		"accessTokenLifespan": 3600,
	"accessTokenLifespanForImplicitFlow": 900,		"accessTokenLifespanForImplicitFlow": 3600,
	"ssoSessionIdleTimeout": 1800,		"ssoSessionIdleTimeout": 7200,
	"ssoSessionMaxLifespan": 36000,		"ssoSessionMaxLifespan": 36000,
	"ssoSessionIdleTimeoutRememberMe": 0,		"ssoSessionIdleTimeoutRememberMe": 0,
	"ssoSessionMaxLifespanRememberMe": 0,		"ssoSessionMaxLifespanRememberMe": 0,

kubernetes/helm/README.md

+126 −243

File changed.

Preview size limit exceeded, changes collapsed.