Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-07 22:12:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: update to elasticsearch 8.4

Browse Source
This commit is contained in:
Rainer Killinger
2022-10-13 10:50:55 +00:00
parent a6e19b1230
commit e0717a96ef
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
.idea .idea
.vscode .vscode
.DS_Store

42
.gitlab-ci.yml
View File

@@ -1,29 +1,44 @@
image: registry.gitlab.com/openstapps/projectmanagement/builder image: registry.gitlab.com/openstapps/projectmanagement/builder
default:
tags:
- docker
stages: stages:
- test
- publish - publish
publish:version: image build:
stage: test
variables:
DOCKER_DRIVER: overlay2
services:
- docker:dind
script:
- export CI_ES_VERSION=$(sed -n '/FROM elasticsearch/p' Dockerfile | cut -d ":" -f 2)
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
- docker build -t $CI_REGISTRY_IMAGE:$CI_ES_VERSION .
- docker tag $CI_REGISTRY_IMAGE:$CI_ES_VERSION $CI_REGISTRY_IMAGE:latest
only:
- branches
main:
stage: publish stage: publish
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:dind - docker:dind
script: script:
- export CI_BUILD_SEM_VERSION=$(echo -n "$CI_BUILD_REF_NAME" | cut -c 2-) - export CI_ES_VERSION=$(sed -n '/FROM elasticsearch/p' Dockerfile | cut -d ":" -f 2)
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
- docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_SEM_VERSION . - docker build -t $CI_REGISTRY_IMAGE:$CI_ES_VERSION .
- docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_SEM_VERSION $CI_REGISTRY_IMAGE:latest - docker tag $CI_REGISTRY_IMAGE:$CI_ES_VERSION $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:$CI_BUILD_SEM_VERSION - docker push $CI_REGISTRY_IMAGE:$CI_ES_VERSION
only: only:
- /v[0-9]+\.[0-9]+\.[0-9]+/ - main
except:
- branches
tags:
- docker
publish:branch: develop:
stage: publish stage: publish
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -34,7 +49,4 @@ publish:branch:
- docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME . - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME .
- docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
only: only:
- /(^master$|^develop$)/ - develop
tags:
- docker

7
Dockerfile
View File

@@ -1,7 +1,8 @@
FROM elasticsearch:5.6-alpine FROM elasticsearch:8.4.2
EXPOSE 9200
EXPOSE 9300
# log4j2
RUN echo "-Dlog4j2.formatMsgNoLookups=true" >> /usr/share/elasticsearch/config/jvm.options
ADD config/ /usr/share/elasticsearch/config/ ADD config/ /usr/share/elasticsearch/config/

10
README.md
View File

@@ -1,13 +1,13 @@
# Database docker image # Database docker image
[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/database.svg?style=flat-square)](https://gitlab.com/openstapps/database/commits/master) [![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/database.svg?style=flat-square)](https://gitlab.com/openstapps/database/commits/main)
[![license)](https://img.shields.io/badge/license-GPL--3.0--only-lightgrey.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) [![license)](https://img.shields.io/badge/license-GPL--3.0--only-lightgrey.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
The used database is Elasticsearch 5.6.x. This images is based on The used database is Elasticsearch 8.4.x. This images is based on
[elasticsearch:5.6](https://hub.docker.com/r/library/elasticsearch/) from the [elasticsearch:8.4](https://hub.docker.com/r/library/elasticsearch/) from the
[offical Docker Library project](https://docs.docker.com/docker-hub/official_repos/) and uses openjdk:8-jre-alpine as a [offical Docker Library project](https://docs.docker.com/docker-hub/official_repos/) and uses openjdk:8-jre-alpine as a
base image. base image.
Additionally the [ICU Analysis Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/5.6/analysis-icu.html) is Additionally the [ICU Analysis Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/8.4/analysis-icu.html) is
installed to provide unicode collation which is used for sorting. installed to provide unicode collation which is used for sorting.
## Usage for testing purposes: ## Usage for testing purposes:
@@ -18,5 +18,5 @@ Currently there is an issue with elasticsearch and java on linux machines that t
To set it permanently, you will have to add it to `/etc/sysctl.conf` on machines that run systemd as a init deamon. To set it permanently, you will have to add it to `/etc/sysctl.conf` on machines that run systemd as a init deamon.
## For production use: ## For production use:
Please set `vm.max_map_count=262144` permanently. It is explained [here](https://www.elastic.co/guide/en/elasticsearch/reference/5.6/docker.html#docker-cli-run-prod-mode) Please set `vm.max_map_count=262144` permanently. It is explained [here](https://www.elastic.co/guide/en/elasticsearch/reference/8.4/docker.html#docker-prod-prerequisites)

12
config/elasticsearch.yml
View File

@@ -1,7 +1,5 @@
network.host: 0.0.0.0 bootstrap.memory_lock: true
discovery.type: "single-node"
# this value is required because we set "network.host" cluster.routing.allocation.disk.threshold_enabled: false
# be sure to modify it appropriately for a production cluster deployment network.bind_host: 0.0.0.0
discovery.zen.minimum_master_nodes: 1 xpack.security.enabled: false
bootstrap.system_call_filter: false