Revert "Preparing develop to be merged with main (docker image tags)" (06032854) · Commits · OSL / code / org.etsi.osl.main

compose/docker-compose.yaml.configure

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.portal.api/		context: ../../org.etsi.osl.portal.api/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"origins": "http://localhost",		"origins": "http://localhost",
	@@ -134,7 +134,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.mano/		context: ../../org.etsi.osl.mano/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
	@@ -160,7 +160,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.bugzilla/		context: ../../org.etsi.osl.bugzilla/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
	@@ -186,7 +186,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.tmf.api/		context: ../../org.etsi.osl.tmf.api/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"origins": "http://localhost",		"origins": "http://localhost",
	@@ -234,7 +234,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.osom/		context: ../../org.etsi.osl.osom/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest		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.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
	@@ -260,7 +260,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.oas/		context: ../../org.etsi.osl.oas/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"origins": "http://localhost",		"origins": "http://localhost",
	@@ -302,7 +302,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.cridge/		context: ../../org.etsi.osl.cridge/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
	@@ -331,7 +331,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.metrico/		context: ../../org.etsi.osl.metrico/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",		"spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
	@@ -376,7 +376,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.centrallog.service/		context: ../../org.etsi.osl.centrallog.service/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
	environment:		environment:
	SPRING_APPLICATION_JSON: '{		SPRING_APPLICATION_JSON: '{
	"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

kubernetes/helm/openslice/values.yaml

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -19,12 +19,12 @@ image:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	centrallog:		centrallog:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	keycloak:		keycloak:
	repository: quay.io/keycloak/keycloak		repository: quay.io/keycloak/keycloak
	pullPolicy: Always		pullPolicy: Always
	@@ -39,22 +39,22 @@ image:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	osom:		osom:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	portalapi:		portalapi:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	osscapi:		osscapi:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	mysql:		mysql:
	repository: mysql		repository: mysql
	pullPolicy: Always		pullPolicy: Always
	@@ -64,27 +64,27 @@ image:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	portalweb:		portalweb:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	tmfweb:		tmfweb:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	cridge:		cridge:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"
	metrico:		metrico:
	repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
	pullPolicy: Always		pullPolicy: Always
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "develop"

	bugzillaurl: example.com:443/bugzilla		bugzillaurl: example.com:443/bugzilla
	bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z		bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z