On Wed, Mar 31, 2021 at 10:52:35AM +0800, Wu Zhende wrote:

Upgrade to 7.11.1. Matches the version of kibana so that data can be displayed on kibana.

Signed-off-by: Wu Zhende wuzhende666@163.com

container/es/Dockerfile | 48 ++++++++++++-------------------------- container/es/build | 4 ++-- container/es/start | 2 +- container/logging-es/build | 8 +++---- container/logging-es/start | 2 +- 5 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/container/es/Dockerfile b/container/es/Dockerfile index ed02490..44d87ee 100644 --- a/container/es/Dockerfile +++ b/container/es/Dockerfile @@ -1,41 +1,24 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.

-FROM alpine:3.11 +FROM elasticsearch:7.11.1@sha256:d52cda1e73d1b1915ba2d76ca1e426620c7b5d6942d9d2f432259503974ba786

ARG MEMORY

-RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com%7Cg' /etc/apk/repositories

-RUN apk add --no-cache elasticsearch curl

-RUN rm -rf /etc/init.d/elasticsearch \

• && rm -rf /usr/share/java/elasticsearch/plugins \
• && mv /usr/share/java/elasticsearch /usr/share/es \
• && echo "===> Creating Elasticsearch Paths..." \
• && for path in \

•     /srv/es \
  

•     /usr/share/es/logs \
  

•     /usr/share/es/config \
  

•     /usr/share/es/config/scripts \
  

•     /usr/share/es/tmp \
  

•     /usr/share/es/plugins \
  

•   ; do \
  

•     mkdir -p "$path"; \
  

•   done \
  

• && cp /etc/elasticsearch/*.* /usr/share/es/config \
• && chown -R 1090:1090 /usr/share/es \
• && chown -R 1090:1090 /srv/es;

-RUN sed -i 's:#path.data: /path/to/data:path.data: /srv/es:' /usr/share/es/config/elasticsearch.yml; -RUN sed -i 's:#network.host: _site_:network.host: 0.0.0.0:' /usr/share/es/config/elasticsearch.yml; -RUN sed -i "s/-Xms256m/-Xms${MEMORY}m/g" /usr/share/es/config/jvm.options -RUN sed -i "s/-Xmx256m/-Xmx${MEMORY}m/g" /usr/share/es/config/jvm.options

-WORKDIR /usr/share/es

-ENV PATH /usr/share/es/bin:$PATH -ENV ES_TMPDIR /usr/share/es/tmp +RUN sed -i 's:#network.host: _site_:network.host: 0.0.0.0:' /usr/share/elasticsearch/config/elasticsearch.yml && \

• sed -i '$a path.data: /srv/es' /usr/share/elasticsearch/config/elasticsearch.yml && \
• sed -i '$a node.name: node-1' /usr/share/elasticsearch/config/elasticsearch.yml && \
• sed -i '$a cluster.initial_master_nodes: ["node-1"]' /usr/share/elasticsearch/config/elasticsearch.yml && \
• sed -i "s/-Xms256m/-Xms${MEMORY}m/g" /usr/share/elasticsearch/config/jvm.options && \
• sed -i "s/-Xmx256m/-Xmx${MEMORY}m/g" /usr/share/elasticsearch/config/jvm.options

+RUN mkdir /usr/share/elasticsearch/tmp && \

• chown -R 1090:1090 /usr/share/elasticsearch

+WORKDIR /usr/share/elasticsearch

+ENV PATH /usr/share/elasticsearch/bin:$PATH +ENV ES_TMPDIR /usr/share/elasticsearch/tmp

VOLUME ["/srv/es"]

@@ -43,4 +26,3 @@ EXPOSE 9200 9300

USER 1090 CMD ["elasticsearch"]

diff --git a/container/es/build b/container/es/build index c7d7115..db5145f 100755 --- a/container/es/build +++ b/container/es/build @@ -5,8 +5,8 @@

require_relative '../defconfig.rb'

-docker_skip_rebuild "es643b:alpine311" +docker_skip_rebuild "es:7.11.1"

available_memory = get_available_memory

-system "docker build -t es643b:alpine311 --build-arg MEMORY=#{available_memory} --network=host ." +system "docker build -t es:7.11.1 --build-arg MEMORY=#{available_memory} --network=host ." diff --git a/container/es/start b/container/es/start index 67d6531..3aa9525 100755 --- a/container/es/start +++ b/container/es/start @@ -15,7 +15,7 @@ cmd=( -v /srv/es:/srv/es -v /etc/localtime:/etc/localtime:ro --name es-server01

• es643b:alpine311

• es:7.11.1

)

"${cmd[@]}" diff --git a/container/logging-es/build b/container/logging-es/build index 3be841a..b50830e 100755 --- a/container/logging-es/build +++ b/container/logging-es/build @@ -5,15 +5,15 @@

require_relative '../defconfig.rb'

-docker_skip_rebuild "logging-es:7.6.2" +docker_skip_rebuild "logging-es:7.11.1"

BASE_IMAGE_DICT = {

• 'aarch64' => 'gagara/elasticsearch-oss-arm64:7.6.2',
• 'x86_64' => 'elasticsearch:7.6.2'

• 'aarch64' => 'elasticsearch:7.11.1@sha256:d52cda1e73d1b1915ba2d76ca1e426620c7b5d6942d9d2f432259503974ba786',
• 'x86_64' => 'elasticsearch:7.11.1'

}.freeze

BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp]

available_memory = get_available_memory

-system "docker build -t logging-es:7.6.2 --build-arg BASE_IMAGE=#{BASE_IMAGE} --build-arg MEMORY=#{available_memory} ." +system "docker build -t logging-es:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} --build-arg MEMORY=#{available_memory} ." diff --git a/container/logging-es/start b/container/logging-es/start index 9be7a5b..05ac46f 100755 --- a/container/logging-es/start +++ b/container/logging-es/start @@ -15,7 +15,7 @@ cmd=( -p 9302:9300 -v /srv/es/logging-es:/srv/es/logging-es --name logging-es

• logging-es:7.6.2

• logging-es:7.11.1

How about set version as a var, it appears several time, and thus can be modified uniformly every time you want to change.

-------- Thanks, Xijian