Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop into Main #2

Merged
merged 2 commits into from
Apr 11, 2021
Merged

Merge Develop into Main #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff3207
Set build argument to install multiple plugins.
MiGoller Feb 19, 2021
911e010
Updated Elasticsearch to version 7.12.0
MiGoller Apr 11, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/docker-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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}