Merge branch '15-use-osl-component-images-from-gitlab-image-registry' into 'develop' (647d3fee) · Commits · OSL / code / org.etsi.osl.main

compose/docker-compose.yaml.configure

+8 −8

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: 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",
	@@ -133,7 +133,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.mano/		context: ../../org.etsi.osl.mano/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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",
	@@ -159,7 +159,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.bugzilla/		context: ../../org.etsi.osl.bugzilla/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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",
	@@ -185,7 +185,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.tmf.api/		context: ../../org.etsi.osl.tmf.api/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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",
	@@ -226,7 +226,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.osom/		context: ../../org.etsi.osl.osom/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",		"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
	@@ -252,7 +252,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.oas/		context: ../../org.etsi.osl.oas/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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",
	@@ -289,7 +289,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.cridge/		context: ../../org.etsi.osl.cridge/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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",
	@@ -328,7 +328,7 @@ services:
	build:		build:
	context: ../../org.etsi.osl.centrallog.service/		context: ../../org.etsi.osl.centrallog.service/
	dockerfile: Dockerfile		dockerfile: Dockerfile
	image: 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

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -16,15 +16,15 @@ image:
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "latest"
	bugzilla:		bugzilla:
	repository: openslice/org.etsi.osl.bugzilla		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.centrallog.service		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: jboss/keycloak		repository: jboss/keycloak
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	@@ -36,45 +36,45 @@ image:
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "latest"		tag: "latest"
	manoclient:		manoclient:
	repository: openslice/org.etsi.osl.mano		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.osom		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.portal.api		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.tmf.api		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: IfNotPresent		pullPolicy: IfNotPresent
	# Overrides the image tag whose default is the chart appVersion.		# Overrides the image tag whose default is the chart appVersion.
	tag: "5.7.43"		tag: "5.7.43"
	oasapi:		oasapi:
	repository: openslice/org.etsi.osl.oas		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.portal.web		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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: openslice/org.etsi.osl.tmf.web		repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
	pullPolicy: IfNotPresent		pullPolicy: IfNotPresent
	# 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

kubernetes/template/bugzilla.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@ spec:
	"bugzillakey":"",		"bugzillakey":"",
	"main_operations_product":""		"main_operations_product":""
	}		}
	image: openslice/org.etsi.osl.bugzilla:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
	name: bugzilla		name: bugzilla
	ports:		ports:
	- containerPort: 13010		- containerPort: 13010

kubernetes/template/centrallog.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ spec:
	"spring.activemq.password": "artemis",		"spring.activemq.password": "artemis",
	"centrallogurl":"http://elk_ip:elk_port/index_name/_doc"		"centrallogurl":"http://elk_ip:elk_port/index_name/_doc"
	}		}
	image: openslice/org.etsi.osl.centrallog.service:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
	name: centrallog		name: centrallog
	ports:		ports:
	- containerPort: 13013		- containerPort: 13013

kubernetes/template/manoclient.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ spec:
	"spring.activemq.password": "artemis",		"spring.activemq.password": "artemis",
	"logging.level.org.springframework" : "INFO"		"logging.level.org.springframework" : "INFO"
	}		}
	image: openslice/org.etsi.osl.mano:latest		image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
	name: manoclient		name: manoclient
	ports:		ports:
	- containerPort: 13011		- containerPort: 13011

Admin message