From fcfe602343cb285af9f2b4aad99ae9a78cd745d9 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Fri, 8 Nov 2024 17:19:10 +0000 Subject: [PATCH 1/3] Update alfresco-audit-storage in compose.yaml to 1.0.0-A1 --- docker-compose/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/compose.yaml b/docker-compose/compose.yaml index 7e5f05c97..fa480a57a 100644 --- a/docker-compose/compose.yaml +++ b/docker-compose/compose.yaml @@ -276,7 +276,7 @@ services: retries: 5 start_period: 5s audit-storage: - image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A8 + image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1 mem_limit: 512m environment: SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000 From 8f59c5e7e2ad32e53abeb2ee846d435efa881a29 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Fri, 8 Nov 2024 17:25:26 +0000 Subject: [PATCH 2/3] Add alfresco-audit-storage and kibana to pre-release-compose.yaml --- docker-compose/pre-release-compose.yaml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml index 515348a75..cf23e5fff 100644 --- a/docker-compose/pre-release-compose.yaml +++ b/docker-compose/pre-release-compose.yaml @@ -203,6 +203,22 @@ services: timeout: 10s retries: 5 start_period: 30s + kibana: + image: kibana:7.17.3 + mem_limit: 1g + environment: + - ELASTICSEARCH_HOSTS=http://elasticsearch:9200 + ports: + - "5601:5601" + depends_on: + elasticsearch: + condition: service_healthy + healthcheck: + test: [ "CMD", "curl", "-f", "-o", "/dev/null", "http://localhost:5601/status" ] + interval: 10s + timeout: 2s + retries: 5 + start_period: 30s search: image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A4 mem_limit: 1g @@ -283,6 +299,26 @@ services: - "traefik.http.middlewares.adwroot.stripprefix.prefixes=/workspace" - "traefik.http.middlewares.adwchain.chain.middlewares=adwforceslash,adwroot" - "traefik.http.routers.adw.middlewares=adwchain@docker" + audit-storage: + image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1 + mem_limit: 512m + environment: + SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000 + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch:9200 + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_USERNAME: admin + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_PASSWORD: admin + AUDIT_EVENTINGESTION_URI: activemq:topic:alfresco.repo.event2 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8081/actuator/health/readiness" ] + interval: 60s + timeout: 2s + retries: 3 + start_period: 15s + depends_on: + activemq: + condition: service_healthy + elasticsearch: + condition: service_healthy control-center: image: quay.io/alfresco/alfresco-control-center:9.1.0-11106981658 mem_limit: 128m From 778c83b9c24da4ecc0b3ad79f0dc8028ce47a222 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Fri, 8 Nov 2024 17:26:57 +0000 Subject: [PATCH 3/3] Update alfresco-elasticsearch-connector in pre-release-compose.yaml to 4.2.0-A5 --- docker-compose/pre-release-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml index cf23e5fff..b6c6bfda1 100644 --- a/docker-compose/pre-release-compose.yaml +++ b/docker-compose/pre-release-compose.yaml @@ -220,7 +220,7 @@ services: retries: 5 start_period: 30s search: - image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A4 + image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A5 mem_limit: 1g environment: ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >- @@ -243,7 +243,7 @@ services: shared-file-store: condition: service_healthy search-reindexing: - image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A4 + image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A5 mem_limit: 1g restart: on-failure:5 environment: