From ce0e4ba45ce4200b88d87ff08f20f04a5496a058 Mon Sep 17 00:00:00 2001 From: amandilaras Date: Thu, 19 Sep 2024 17:13:53 +0300 Subject: [PATCH] remove docs / fix image names on ntf and ant --- deployment/.env | 2 +- deployment/config-files/keycloak/keycloak.env | 1 - deployment/docker-compose.override.yml | 9 --------- deployment/docker-compose.yml | 4 ++-- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/deployment/.env b/deployment/.env index ef8f894c7..d9c7b6357 100644 --- a/deployment/.env +++ b/deployment/.env @@ -11,7 +11,7 @@ ZENODO_APP_TAG=2.1.7 POSTGRES_TAG=16-alpine ELK_TAG=8.13.0 KEYCLOAK_TAG=24.0.2 -RABBITMQ_TAG=3.15-management +RABBITMQ_TAG=3.13-management PDF_SERVICE_TAG=8.9.2 #Docker configuration diff --git a/deployment/config-files/keycloak/keycloak.env b/deployment/config-files/keycloak/keycloak.env index ac4880279..70a9560e6 100644 --- a/deployment/config-files/keycloak/keycloak.env +++ b/deployment/config-files/keycloak/keycloak.env @@ -1,4 +1,3 @@ -##################### KEYCLOAK ######################### # DB related configuraation KC_DB=postgres KC_DB_URL_HOST=opencdmp.postgres diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index 2dfa29367..a7315e799 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -246,15 +246,6 @@ services: networks: - opencdmp-pdf-service-shared-network -################################# DOCS ################################# - - opendmp.docs: - cpus: "0.3" - mem_limit: 256M - restart: unless-stopped - expose: - - "3000" - networks: opencdmp-proxy-network: name: opencdmp-proxy-network diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 3ac879c0d..1a1201a30 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -35,14 +35,14 @@ services: opencdmp.notification: container_name: opencdmp.notification - image: ${DOCKER_REGISTRY}open-dmp-notification-api:${NOTIFICATION_APP_TAG} + image: ${DOCKER_REGISTRY}java-pomolo-notification-api:${NOTIFICATION_APP_TAG} depends_on: opencdmp.postgres: condition: service_started opencdmp.annotation: container_name: opencdmp.annotation - image: ${DOCKER_REGISTRY}open-dmp-annotation-api:${ANNOTATION_APP_TAG} + image: ${DOCKER_REGISTRY}java-pomolo-annotation-api:${ANNOTATION_APP_TAG} depends_on: opencdmp.postgres: condition: service_started