Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/beta-docker-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ package_json_version=$(grep '"version":' package.json | cut -d ':' -f 2- | tr -d
beta_feature=$(echo $package_json_version | sed -r 's/[0-9]+.[0-9]+.[0-9]+-//')
beta_feature=$(echo $beta_feature | sed -r 's/-beta\.[0-9]*$//')

docker_image=$(curl https://hub.docker.com/v2/repositories/getmeili/meilisearch/tags | jq | grep "$beta_feature" | head -1)
docker_image=$(curl https://hub.docker.com/v2/repositories/getmeili/meilisearch-enterprise/tags | jq | grep "$beta_feature" | head -1)
docker_image=$(echo $docker_image | grep '"name":' | cut -d ':' -f 2- | tr -d ' ' | tr -d '"' | tr -d ',')
echo $docker_image
10 changes: 5 additions & 5 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:
options: --user 1001
services:
meilisearch:
image: getmeili/meilisearch:latest
image: getmeili/meilisearch-enterprise:latest
env:
MEILI_MASTER_KEY: 'masterKey'
MEILI_NO_ANALYTICS: 'true'
MEILI_MASTER_KEY: "masterKey"
MEILI_NO_ANALYTICS: "true"
ports:
- '7700:7700'
- "7700:7700"

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v6
with:
node-version: '20.x'
node-version: "20.x"
cache: yarn
- name: Cache dependencies
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Each PR should pass the tests and the linter to be accepted.

```bash
# Run a Meilisearch instance
docker pull getmeili/meilisearch:latest # Fetch the latest version of Meilisearch image from Docker Hub
docker run -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey --no-analytics
docker pull getmeili/meilisearch-enterprise:latest # Fetch the latest version of Meilisearch image from Docker Hub
docker run -p 7700:7700 getmeili/meilisearch-enterprise:latest meilisearch --master-key=masterKey --no-analytics

# Integration tests
yarn test
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- "1337:1337"

meilisearch:
image: getmeili/meilisearch:latest
image: getmeili/meilisearch-enterprise:latest
ports:
- "7700:7700"
environment:
Expand Down
2 changes: 1 addition & 1 deletion resources/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
depends_on:
- meilisearch
meilisearch:
image: getmeili/meilisearch
image: getmeili/meilisearch-enterprise
command: meilisearch
volumes:
- ../meilisearch/data.ms:/data.ms
Expand Down
Loading