From 4181cca0adf503fb6fff8abba452df2b4e37a461 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Thu, 1 Aug 2024 15:22:42 +0300
Subject: [PATCH] preparing 2024Q2_RC to merge with main (renamed image tag
name :develop -> :latest)
---
compose/docker-compose.yaml.configure | 16 ++++++++--------
kubernetes/helm/openslice/values.yaml | 20 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index ef91ade..088d9c8 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -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",
@@ -233,7 +233,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",
@@ -259,7 +259,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",
@@ -301,7 +301,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",
@@ -345,7 +345,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",
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 178451e..e3b53ec 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -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,22 +64,22 @@ 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"
bugzillaurl: example.com:443/bugzilla
bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
--
GitLab