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

Preparing develop to be merged with main (docker image tags)

parent dd6d193a
No related branches found
No related tags found
1 merge request!46MR for Release 2024Q4
Pipeline #11244 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
compose/docker-compose.yaml.configure
+ 9
− 9
View file @ bb3669f0
......@@ -86,7 +86,7 @@ services:
build:
context: ../../org.etsi.osl.portal.api/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -134,7 +134,7 @@ services:
build:
context: ../../org.etsi.osl.mano/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -160,7 +160,7 @@ services:
build:
context: ../../org.etsi.osl.bugzilla/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -186,7 +186,7 @@ services:
build:
context: ../../org.etsi.osl.tmf.api/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -234,7 +234,7 @@ services:
build:
context: ../../org.etsi.osl.osom/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest
environment:
SPRING_APPLICATION_JSON: '{
"spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
......@@ -260,7 +260,7 @@ services:
build:
context: ../../org.etsi.osl.oas/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
......@@ -302,7 +302,7 @@ services:
build:
context: ../../org.etsi.osl.cridge/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......@@ -331,7 +331,7 @@ services:
build:
context: ../../org.etsi.osl.metrico/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest
environment:
SPRING_APPLICATION_JSON: '{
"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:
context: ../../org.etsi.osl.centrallog.service/
dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest
environment:
SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......
kubernetes/helm/openslice/values.yaml
+ 11
− 11
View file @ bb3669f0
......@@ -19,12 +19,12 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
centrallog:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
keycloak:
repository: quay.io/keycloak/keycloak
pullPolicy: Always
......@@ -39,22 +39,22 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
osom:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
portalapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
osscapi:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
mysql:
repository: mysql
pullPolicy: Always
......@@ -64,27 +64,27 @@ image:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
portalweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
tmfweb:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
cridge:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
metrico:
repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "develop"
tag: "latest"
bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment