From 693dd7892f4032586a1cd2c23b44291ff97538dd Mon Sep 17 00:00:00 2001 From: pmacius Date: Thu, 18 Jul 2024 10:14:08 +0200 Subject: [PATCH 1/8] OPSEXP-2733 Add search enterprise content image Dockerfile --- .github/workflows/build_and_test.yml | 6 ++++++ docker-compose/docker-compose.yml | 6 ++++++ search/enterprise/README.md | 17 +++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3089ad97..eb5e3445 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -20,6 +20,12 @@ jobs: path: search/enterprise/common classifier: -app.jar group: org.alfresco + - artifact: alfresco-elasticsearch-live-indexing-content + version: 4.0.1 + name: alfresco-enterprise-search-content + path: search/enterprise/common + classifier: -app.jar + group: org.alfresco steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # 4.1.7 diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a52d5d14..1ef04a8e 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -191,6 +191,12 @@ services: environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 + live-indexing-content: + image: alfresco-enterprise-search-content:test + environment: + SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 + SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 + ALFRESCO_SHAREDFILESTORE_BASEURL: http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file volumes: shared-file-store-volume: driver_opts: diff --git a/search/enterprise/README.md b/search/enterprise/README.md index ca5c17c9..59d80ef7 100644 --- a/search/enterprise/README.md +++ b/search/enterprise/README.md @@ -31,3 +31,20 @@ live-indexing-path: - `SPRING_ELASTICSEARCH_REST_URIS` - Elasticsearch server, by default `http://elasticsearch:9200` - `SPRING_ACTIVEMQ_BROKERURL` - Alfresco ActiveMQ, by default `nio://activemq:61616` + +## path + +```yaml + +live-indexing-content: + image: alfresco-enterprise-search-content:YOUR-TAG + environment: + SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 + SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 + ALFRESCO_SHAREDFILESTORE_BASEURL: http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file + +``` + +- `SPRING_ELASTICSEARCH_REST_URIS` - Elasticsearch server, by default `http://elasticsearch:9200` +- `SPRING_ACTIVEMQ_BROKERURL` - Alfresco ActiveMQ, by default `nio://activemq:61616` +- `ALFRESCO_SHAREDFILESTORE_BASEURL` - Alfresco Shared FileStore endpoint, by default `http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file/` From 7d4b14836ff7dd8f0739a54a92d3c0e0b9ddfbaa Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 19 Jul 2024 17:17:26 +0200 Subject: [PATCH 2/8] artifact add --- search/enterprise/common/artifacts.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/search/enterprise/common/artifacts.json b/search/enterprise/common/artifacts.json index 01775474..8ef90155 100644 --- a/search/enterprise/common/artifacts.json +++ b/search/enterprise/common/artifacts.json @@ -14,6 +14,13 @@ "path": "search/enterprise/common", "classifier": "-app.jar", "group": "org.alfresco" + }, + { + "name": "alfresco-elasticsearch-live-indexing-content", + "version": "4.0.1", + "path": "search/enterprise/common", + "classifier": "-app.jar", + "group": "org.alfresco" } ] } From afbc94e62817022bf68a7f7f057bde366d141451 Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 19 Jul 2024 17:21:51 +0200 Subject: [PATCH 3/8] fix tag --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index e7da0357..e03d4dc1 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -192,7 +192,7 @@ services: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 live-indexing-content: - image: alfresco-enterprise-search-content:test + image: alfresco-enterprise-search-content:latest environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 From 797ebfe9a5578980988109ca6c4501e16625671b Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 19 Jul 2024 17:29:00 +0200 Subject: [PATCH 4/8] add item in matrix --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 34308fcd..84543e2e 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -155,7 +155,7 @@ target "repository" { target "search_liveindexing" { matrix = { - liveindexing = ["metadata", "path"] + liveindexing = ["metadata", "path", "content"] } name = "search_liveindexing-${liveindexing}" args = { From 4f5143be3fa0b2375447b689728e1a37a6ffc6bb Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 19 Jul 2024 17:34:31 +0200 Subject: [PATCH 5/8] fix image name --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index e03d4dc1..fbb63eb2 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -192,7 +192,7 @@ services: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 live-indexing-content: - image: alfresco-enterprise-search-content:latest + image: alfresco-elasticsearch-live-indexing-content:latest environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 From bf472ee4c63553bd6465a73c14659fa1faf0659f Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 19 Jul 2024 17:44:39 +0200 Subject: [PATCH 6/8] fix readme --- search/enterprise/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/search/enterprise/README.md b/search/enterprise/README.md index 59d80ef7..1d7dc0ff 100644 --- a/search/enterprise/README.md +++ b/search/enterprise/README.md @@ -7,7 +7,7 @@ Sets of variables configurable with your docker image ```yaml live-indexing-metadata: - image: alfresco-enterprise-search-metadata:YOUR-TAG + image: alfresco-elasticsearch-live-indexing-metadata:YOUR-TAG environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 @@ -22,7 +22,7 @@ live-indexing-metadata: ```yaml live-indexing-path: - image: alfresco-enterprise-search-path:YOUR-TAG + image: alfresco-elasticsearch-live-indexing-path:YOUR-TAG environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 @@ -37,7 +37,7 @@ live-indexing-path: ```yaml live-indexing-content: - image: alfresco-enterprise-search-content:YOUR-TAG + image: alfresco-elasticsearch-live-indexing:YOUR-TAG environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 From afade4048772cbef2dbf4a63002e43f06db486bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Maciusiak?= <158472457+pmacius@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:23:26 +0200 Subject: [PATCH 7/8] Apply suggestions from code review Co-authored-by: Alex Chapellon --- search/enterprise/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search/enterprise/README.md b/search/enterprise/README.md index 1d7dc0ff..4de1e132 100644 --- a/search/enterprise/README.md +++ b/search/enterprise/README.md @@ -32,12 +32,12 @@ live-indexing-path: - `SPRING_ELASTICSEARCH_REST_URIS` - Elasticsearch server, by default `http://elasticsearch:9200` - `SPRING_ACTIVEMQ_BROKERURL` - Alfresco ActiveMQ, by default `nio://activemq:61616` -## path +## content ```yaml live-indexing-content: - image: alfresco-elasticsearch-live-indexing:YOUR-TAG + image: alfresco-elasticsearch-live-indexing-content:YOUR-TAG environment: SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 From 451ba7e90ce4f8f2d0b257ffd20f20666dab0417 Mon Sep 17 00:00:00 2001 From: pmacius Date: Mon, 22 Jul 2024 15:25:12 +0200 Subject: [PATCH 8/8] fix readme --- search/enterprise/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search/enterprise/README.md b/search/enterprise/README.md index 4de1e132..db3ba187 100644 --- a/search/enterprise/README.md +++ b/search/enterprise/README.md @@ -32,7 +32,7 @@ live-indexing-path: - `SPRING_ELASTICSEARCH_REST_URIS` - Elasticsearch server, by default `http://elasticsearch:9200` - `SPRING_ACTIVEMQ_BROKERURL` - Alfresco ActiveMQ, by default `nio://activemq:61616` -## content +## content ```yaml