Merge pull request #2 from MiGoller/develop

Merge Develop into Main

.github/workflows/docker-release.yml

@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        elastictag: ['7.9.3', '7.10.1']
-    name: Publish Ekasticsearch v${{ matrix.elastictag }} images to GitHub and DockerHub Container Registries
+        elastictag: ['7.9.3', '7.12.0']
+    name: Publish Elasticsearch v${{ matrix.elastictag }} images to GitHub and DockerHub Container Registries
     if: (github.ref == 'refs/heads/main')
         || (github.event_name == 'schedule')
 

Dockerfile

@@ -6,11 +6,13 @@
 #
 
 # Set the base elastic image's tag
-ARG ELASTICTAG=7.9.3
+ARG ELASTICTAG=7.12.0
 
 # Set the base image to use for subsequent instructions.
 FROM elasticsearch:${ELASTICTAG}
 
+ARG ELASTICSEARCHPLUGINS="ingest-attachment"
+
 # Basic build-time metadata as defined at http://label-schema.org
 LABEL \
     org.label-schema.docker.dockerfile="/Dockerfile" \
@@ -29,4 +31,4 @@ LABEL \
 
 # Install additional plugins for Nextcloud's fulltext search
 RUN \
-    bin/elasticsearch-plugin install --batch ingest-attachment
+    bin/elasticsearch-plugin install --batch ${ELASTICSEARCHPLUGINS}