Skip to content
Snippets Groups Projects
Commit 647d3fee authored by trantzas's avatar trantzas
Browse files

Merge branch '15-use-osl-component-images-from-gitlab-image-registry' into 'develop'

Resolve "Use OSL component images from Gitlab image registry"

See merge request !23
parents cac2fc4d 705c3f13
No related branches found
No related tags found
4 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!28Resolve "Kubernetes installation needs to include CRIDGE component",!23Resolve "Use OSL component images from Gitlab image registry"
Pipeline #5243 passed
......@@ -86,7 +86,7 @@ services:
build:
context: ../../org.etsi.osl.portal.api/
dockerfile: Dockerfile
image: org.etsi.osl.portal.api:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -133,7 +133,7 @@ services:
build:
context: ../../org.etsi.osl.mano/
dockerfile: Dockerfile
image: org.etsi.osl.mano:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -159,7 +159,7 @@ services:
build:
context: ../../org.etsi.osl.bugzilla/
dockerfile: Dockerfile
image: org.etsi.osl.bugzilla:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -185,7 +185,7 @@ services:
build:
context: ../../org.etsi.osl.tmf.api/
dockerfile: Dockerfile
image: org.etsi.osl.tmf.api:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -226,7 +226,7 @@ services:
build:
context: ../../org.etsi.osl.osom/
dockerfile: Dockerfile
image: org.etsi.osl.osom:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -252,7 +252,7 @@ services:
build:
context: ../../org.etsi.osl.oas/
dockerfile: Dockerfile
image: org.etsi.osl.oas:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -289,7 +289,7 @@ services:
build:
context: ../../org.etsi.osl.cridge/
dockerfile: Dockerfile
image: org.etsi.osl.cridge:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -328,7 +328,7 @@ services:
build:
context: ../../org.etsi.osl.centrallog.service/
dockerfile: Dockerfile
image: org.etsi.osl.centrallog.service:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......
......@@ -16,15 +16,15 @@ image:
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
bugzilla:
repository: openslice/org.etsi.osl.bugzilla
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
centrallog:
repository: openslice/org.etsi.osl.centrallog.service
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
keycloak:
repository: jboss/keycloak
pullPolicy: IfNotPresent
......@@ -36,45 +36,45 @@ image:
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
manoclient:
repository: openslice/org.etsi.osl.mano
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
osom:
repository: openslice/org.etsi.osl.osom
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
portalapi:
repository: openslice/org.etsi.osl.portal.api
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
osscapi:
repository: openslice/org.etsi.osl.tmf.api
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
mysql:
repository: mysql
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "5.7.43"
oasapi:
repository: openslice/org.etsi.osl.oas
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
portalweb:
repository: openslice/org.etsi.osl.portal.web
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
tmfweb:
repository: openslice/org.etsi.osl.tmf.web
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "develop"
bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
......
......@@ -27,7 +27,7 @@ spec:
"bugzillakey":"",
"main_operations_product":""
}
image: openslice/org.etsi.osl.bugzilla:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
name: bugzilla
ports:
- containerPort: 13010
......
......@@ -25,7 +25,7 @@ spec:
"spring.activemq.password": "artemis",
"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
ports:
- containerPort: 13013
......
......@@ -25,7 +25,7 @@ spec:
"spring.activemq.password": "artemis",
"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
ports:
- containerPort: 13011
......
......@@ -46,7 +46,7 @@ spec:
"spring.activemq.password": "artemis",
"logging.level.org.springframework" : "INFO"
}
image: openslice/org.etsi.osl.oas:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
name: openslice-oasapi
ports:
- containerPort: 13101
......
......@@ -27,7 +27,7 @@ spec:
"spring.activemq.password": "artemis",
"logging.level.org.springframework" : "INFO"
}
image: openslice/org.etsi.osl.osom:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
name: openslice-osom
ports:
- containerPort: 13100
......
......@@ -27,7 +27,7 @@ spec:
command: ['sh', '-c', "until nslookup mysql; do echo waiting for mysql; sleep 2; done"]
containers:
- name: openslice-portalapi
image: openslice/org.etsi.osl.portal.api:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
ports:
- containerPort: 13000
volumeMounts:
......
......@@ -48,7 +48,7 @@ spec:
"logging.level.org.springframework":"INFO",
"kroki.serverurl":"http://INGRESSADDR/kroki"
}
image: openslice/org.etsi.osl.tmf.api:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
name: openslice-scapi
ports:
- containerPort: 13082
......
......@@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: openslice-portalweb
image: openslice/org.etsi.osl.portal.web:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web:develop
ports:
- containerPort: 80
volumeMounts:
......
......@@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: openslice-tmfweb
image: openslice/org.etsi.osl.tmf.web:latest
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web:develop
ports:
- containerPort: 80
volumeMounts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment