From 23dab5cf4701532991d256814d9e62641c5750df Mon Sep 17 00:00:00 2001 From: Daneryl Date: Tue, 3 Dec 2024 09:35:07 +0100 Subject: [PATCH] Update elastic to the next minor version --- .github/workflows/ci_check_translations.yml | 2 +- .github/workflows/ci_e2e_cypress_base.yml | 2 +- .github/workflows/ci_e2e_cypress_pages.yml | 2 +- .github/workflows/ci_e2e_cypress_ssettings.yml | 2 +- .github/workflows/ci_e2e_puppeteer.yml | 2 +- .github/workflows/ci_unit_tests.yml | 2 +- README.md | 2 +- docker-compose.yml | 2 +- elastic-icu-7.17.6.Dockerfile => elastic-icu-7.17.7.Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename elastic-icu-7.17.6.Dockerfile => elastic-icu-7.17.7.Dockerfile (74%) diff --git a/.github/workflows/ci_check_translations.yml b/.github/workflows/ci_check_translations.yml index e30f4b96eb..769251d5c2 100644 --- a/.github/workflows/ci_check_translations.yml +++ b/.github/workflows/ci_check_translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10 diff --git a/.github/workflows/ci_e2e_cypress_base.yml b/.github/workflows/ci_e2e_cypress_base.yml index 31454fe1d6..9373588da6 100644 --- a/.github/workflows/ci_e2e_cypress_base.yml +++ b/.github/workflows/ci_e2e_cypress_base.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=30s --health-retries=10 diff --git a/.github/workflows/ci_e2e_cypress_pages.yml b/.github/workflows/ci_e2e_cypress_pages.yml index c44f9f9c28..18fd64e4d3 100644 --- a/.github/workflows/ci_e2e_cypress_pages.yml +++ b/.github/workflows/ci_e2e_cypress_pages.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=30s --health-retries=10 diff --git a/.github/workflows/ci_e2e_cypress_ssettings.yml b/.github/workflows/ci_e2e_cypress_ssettings.yml index 89c0879209..54cd91089c 100644 --- a/.github/workflows/ci_e2e_cypress_ssettings.yml +++ b/.github/workflows/ci_e2e_cypress_ssettings.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=30s --health-retries=10 diff --git a/.github/workflows/ci_e2e_puppeteer.yml b/.github/workflows/ci_e2e_puppeteer.yml index b571366770..7d797a743d 100644 --- a/.github/workflows/ci_e2e_puppeteer.yml +++ b/.github/workflows/ci_e2e_puppeteer.yml @@ -19,7 +19,7 @@ jobs: suite-dir: ['regression_suites', 'suite1', 'suite2', 'mobile'] services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10 diff --git a/.github/workflows/ci_unit_tests.yml b/.github/workflows/ci_unit_tests.yml index 1a6523d774..521f7a3dd1 100644 --- a/.github/workflows/ci_unit_tests.yml +++ b/.github/workflows/ci_unit_tests.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64 ports: - 9200/tcp options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10 diff --git a/README.md b/README.md index 145d034a0b..ea727f8cd0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Read the [user guide](https://uwazi.io/page/9852italrtk/support) Before anything else you will need to install the application dependencies: - **NodeJs >= 20.9.0** For ease of update, use nvm: https://github.com/creationix/nvm. -- **ElasticSearch 7.17.6** https://www.elastic.co/downloads/past-releases/elasticsearch-7-17-6 Please note that ElasticSearch requires Java. Follow the instructions to install the package manually, you also probably need to disable ml module in the ElasticSearch config file: +- **ElasticSearch 7.17.7** https://www.elastic.co/downloads/past-releases/elasticsearch-7-17-6 Please note that ElasticSearch requires Java. Follow the instructions to install the package manually, you also probably need to disable ml module in the ElasticSearch config file: `xpack.ml.enabled: false` - **ICU Analysis Plugin (recommended)** [installation](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html#analysis-icu) Adds support for number sorting in texts and solves other language sorting nuances. This option is activated by setting the env var USE_ELASTIC_ICU=true before running the server (defaults to false/unset). - **MongoDB 5.0.27** https://www.mongodb.com/docs/v5.0/installation/ . If you have a previous version installed, please follow the instructions on how to [upgrade here](https://www.mongodb.com/docs/manual/release-notes/5.0-upgrade-standalone/). The new mongosh dependency needs to be added [installation](https://www.mongodb.com/docs/mongodb-shell/). diff --git a/docker-compose.yml b/docker-compose.yml index 44c9ce20dc..a84dc29aa9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: elasticsearch: build: context: . - dockerfile: elastic-icu-7.17.6.Dockerfile + dockerfile: elastic-icu-7.17.7.Dockerfile container_name: uwazi-elasticsearch volumes: - esdata01:/usr/share/elasticsearch/data diff --git a/elastic-icu-7.17.6.Dockerfile b/elastic-icu-7.17.7.Dockerfile similarity index 74% rename from elastic-icu-7.17.6.Dockerfile rename to elastic-icu-7.17.7.Dockerfile index 4e2af988c3..2ed30d8f37 100644 --- a/elastic-icu-7.17.6.Dockerfile +++ b/elastic-icu-7.17.7.Dockerfile @@ -1,2 +1,2 @@ -FROM elasticsearch:7.17.6 +FROM elasticsearch:7.17.7 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu