From 060328548ebba2b603c206044f58bf46b029da74 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 21:24:12 +0000 Subject: [PATCH] Revert "Preparing develop to be merged with main (docker image tags)" This reverts commit bb3669f0c8d74a7f8e343f41d51709b303b7ce69 --- compose/docker-compose.yaml.configure | 18 +++++++++--------- kubernetes/helm/openslice/values.yaml | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index ce1ebc0..0638cbc 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:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop 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: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", @@ -160,7 +160,7 @@ services: build: context: ../../org.etsi.osl.bugzilla/ 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: 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:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop 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:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop 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:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop 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: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", @@ -331,7 +331,7 @@ services: build: context: ../../org.etsi.osl.metrico/ 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: 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: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", diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index ba45552..ee1f4f7 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" 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: "latest" + tag: "develop" bugzillaurl: example.com:443/bugzilla bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z -- GitLab