From 78c87e7a47a45a9d97ae3eefc74c3bb7b966a003 Mon Sep 17 00:00:00 2001 From: BeritJanssen Date: Thu, 16 Jan 2025 20:06:28 +0100 Subject: [PATCH] remove elasticsearch mapper-annotated-text dependency from Docker config --- .github/workflows/scheduled-build-and-push.yml | 9 --------- DockerfileElastic | 3 --- docker-compose.yaml | 4 +--- 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 DockerfileElastic diff --git a/.github/workflows/scheduled-build-and-push.yml b/.github/workflows/scheduled-build-and-push.yml index 2e7e6dcce..c534a7379 100644 --- a/.github/workflows/scheduled-build-and-push.yml +++ b/.github/workflows/scheduled-build-and-push.yml @@ -39,12 +39,3 @@ jobs: tags: ghcr.io/centrefordigitalhumanities/ianalyzer-backend:latest cache-from: type=registry,ref=ghcr.io/centrefordigitalhumanities/ianalyzer-backend:latest cache-to: type=inline - - name: Build Elasticsearch image, using cache from Github registry - uses: docker/build-push-action@v6 - with: - context: . - file: DockerfileElastic - push: true - tags: ghcr.io/centrefordigitalhumanities/ianalyzer-elasticsearch:latest - cache-from: type=registry,ref=ghcr.io/centrefordigitalhumanities/ianalyzer-elasticsearch:latest - cache-to: type=inline diff --git a/DockerfileElastic b/DockerfileElastic deleted file mode 100644 index 2b908c5fb..000000000 --- a/DockerfileElastic +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:8.10.2 - -RUN bin/elasticsearch-plugin install mapper-annotated-text diff --git a/docker-compose.yaml b/docker-compose.yaml index 8d060d954..fbcfb8995 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -52,9 +52,7 @@ services: target: /frontend/build command: sh -c "yarn prebuild && yarn start-docker" elasticsearch: - build: - context: . - dockerfile: DockerfileElastic + image: docker.elastic.co/elasticsearch/elasticsearch:8 environment: - node.name=ianalyzer-node - discovery.type=single-node