Skip to content

Commit

Permalink
Merge pull request #4017 from 10up/chore/update-es-version
Browse files Browse the repository at this point in the history
Use ES 8 by default
  • Loading branch information
felipeelia authored Nov 26, 2024
2 parents aa088d1 + e09a563 commit 2fee5e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/es-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ES_VERSION=7.10.2
ARG ES_VERSION=8.16.1
FROM docker.elastic.co/elasticsearch/elasticsearch:${ES_VERSION}

RUN if [ -d plugins/ingest-attachment ]; then true ; else ./bin/elasticsearch-plugin install ingest-attachment -b; fi
2 changes: 1 addition & 1 deletion bin/es-docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
dockerfile: Dockerfile
context: .
args:
ES_VERSION: ${ES_VERSION-7.10.2}
ES_VERSION: ${ES_VERSION-8.16.1}
ports:
- 8890:9200
mem_limit: 1024M
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"env:start": "wp-env start && npm run env:install-tests-cli && npm run es:start",
"env:stop": "wp-env stop && npm run es:stop",
"env:reset": "wp-env clean all && npm run env:start && npm run cypress:setup",
"es:start": "cd bin/es-docker/ && docker compose build --build-arg ES_VERSION=${ES_VERSION-7.10.2} && docker compose up -d",
"es:start": "cd bin/es-docker/ && docker compose build --build-arg ES_VERSION=${ES_VERSION-8.16.1} && docker compose up -d",
"es:stop": "cd bin/es-docker/ && docker compose down",
"cypress:setup": "./bin/setup-cypress-env.sh",
"cypress:open": "cypress open --config-file tests/cypress/config.js",
Expand Down

0 comments on commit 2fee5e2

Please sign in to comment.