Skip to content

Commit 6ec6bea

Browse files
carlosedpcarlosedp
committed
Updated versions to 6.3.0. Added argument to Dockerfiles to avoid updating many files. Updated build script
1 parent ef5aa3b commit 6ec6bea

File tree

17 files changed

+57
-38
lines changed

17 files changed

+57
-38
lines changed

‎es-client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
privileged: true
3636
containers:
3737
- name: es-client
38-
image: carlosedp/docker-elasticsearch-kubernetes:6.2.3
38+
image: carlosedp/docker-elasticsearch-kubernetes:6.3.0
3939
env:
4040
- name: NAMESPACE
4141
valueFrom:

‎es-configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ data:
3434
ping.unicast.hosts: ${DISCOVERY_SERVICE}
3535
minimum_master_nodes: ${NUMBER_OF_MASTERS}
3636
37-
#xpack.license.self_generated.type: basic
37+
xpack.license.self_generated.type: basic
3838
#xpack.security.enabled: false
3939
#xpack.monitoring.enabled: false
40-
#xpack.ml.enabled: false
40+
xpack.ml.enabled: false
4141
4242
cluster.routing.allocation.enable: all
4343
cluster.routing.rebalance.enable: all

‎es-curator_v1beta1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
spec:
1111
containers:
1212
- name: curator
13-
image: carlosedp/docker-elasticsearch-curator:5.5.1
13+
image: carlosedp/docker-elasticsearch-curator:5.5.4
1414
args:
1515
- --config
1616
- /etc/config/config.yml

‎es-data-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
privileged: true
3131
containers:
3232
- name: es-data
33-
image: carlosedp/docker-elasticsearch-kubernetes:6.2.3
33+
image: carlosedp/docker-elasticsearch-kubernetes:6.3.0
3434
resources:
3535
limits:
3636
cpu: 2

‎es-full.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
privileged: true
3131
containers:
3232
- name: es-full
33-
image: carlosedp/docker-elasticsearch-kubernetes:6.2.3
33+
image: carlosedp/docker-elasticsearch-kubernetes:6.3.0
3434
resources:
3535
limits:
3636
cpu: 1

‎es-master.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
privileged: true
3636
containers:
3737
- name: es-master
38-
image: carlosedp/docker-elasticsearch-kubernetes:6.2.3
38+
image: carlosedp/docker-elasticsearch-kubernetes:6.3.0
3939
env:
4040
- name: NAMESPACE
4141
valueFrom:

‎fluentd-es-ds.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
serviceAccountName: fluentd-es
7474
containers:
7575
- name: fluentd-es
76-
image: carlosedp/fluentd-elasticsearch:1.2.0
76+
image: carlosedp/fluentd-elasticsearch:1.2.2
7777
env:
7878
- name: FLUENTD_ARGS
7979
value: --no-supervisor -q

‎images/build_images.sh

+21-18
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,38 @@
22
#
33
# To update image versions and the Kubernetes manifests edit:
44
# - ./build_images.sh - #Versions section
5-
# - ./debian-oraclejava/Dockerfile - Versions and download path
6-
# - ./docker-elasticsearch/Dockerfile - FROM and ES_VERSION lines
7-
# - ./docker-elasticsearch-kubernetes/Dockerfile - FROM line
8-
# - ./docker-elasticsearch-curator/Dockerfile - "pip install" line
9-
# - ./docker-kibana/Dockerfile - KIBANA_VERSION line
5+
# - ./debian-oraclejava/Dockerfile - Versions and download path for new Java
6+
# - ./docker-elasticsearch/Dockerfile - FROM in case of Java update
7+
# - ./docker-kibana/Dockerfile - LOGTRAIL_VERSION line
108
# - ./fluentd-elasticsearch/Gemfile - Gem versions
11-
# - ./elasticsearch-cerebro/Dockerfile - ENV CEREBRO_VERSION line
12-
# - Manifest es-curator_v1beta1.yaml - "image" line
13-
# - Manifest es-data-statefulset.yaml - "image" line
14-
# - Manifest es-master.yaml - "image" line
15-
# - Manifest fluentd-es-ds.yaml - "image" line
16-
# - Manifest kibana.yaml - "image" line
17-
# - Manifest cerebro.yaml - "image" line
9+
# - ./elasticsearch-cerebro/Dockerfile - FROM in case of Java update
10+
# Manifests:
11+
# - es-client.yaml - "image" line
12+
# - es-master.yaml - "image" line
13+
# - es-data-statefulset.yaml - "image" line
14+
# - es-full.yaml - "image" line
15+
# - es-curator_v1beta1.yaml - "image" line
16+
# - fluentd-es-ds.yaml - "image" line
17+
# - kibana.yaml - "image" line
18+
# - cerebro.yaml - "image" line
19+
# - prometheus_exporter/elasticsearch-exporter-deployment.yaml - "image" line
1820

1921
# Versions
2022
JAVA_VERSION=8-172
21-
ES_VERSION=6.2.3
22-
CURATOR_VERSION=5.5.1
23-
FLUENTD_VERSION=1.2.0
23+
ES_VERSION=6.3.0
24+
CURATOR_VERSION=5.5.4
25+
FLUENTD_VERSION=1.2.2
2426
CEREBRO_VERSION=0.7.3
27+
EXPORTER_VERSION=1.0.2
2528

2629
REGISTRY=carlosedp
2730

2831
# Architectures
2932
ARCHITECTURES=(arm64)
3033

3134
# Images and respective versions
32-
IMAGES=(debian-oraclejava docker-elasticsearch docker-elasticsearch-kubernetes docker-elasticsearch-curator fluentd-elasticsearch docker-kibana elasticsearch-cerebro)
33-
VERSIONS=($JAVA_VERSION $ES_VERSION $ES_VERSION $CURATOR_VERSION $FLUENTD_VERSION $ES_VERSION $CEREBRO_VERSION)
35+
IMAGES=(debian-oraclejava docker-elasticsearch docker-elasticsearch-kubernetes docker-elasticsearch-curator fluentd-elasticsearch docker-kibana elasticsearch-cerebro elasticsearch_exporter)
36+
VERSIONS=($JAVA_VERSION $ES_VERSION $ES_VERSION $CURATOR_VERSION $FLUENTD_VERSION $ES_VERSION $CEREBRO_VERSION $EXPORTER_VERSION)
3437

3538
num_img=$((${#IMAGES[*]}-1))
3639

@@ -43,7 +46,7 @@ function build_image {
4346
VERSION=${VERSIONS[$I]}
4447

4548
echo "Building image $IMAGE version $VERSION"
46-
docker build -t $REGISTRY/$IMAGE:$VERSION-$ARCH ./$IMAGE
49+
docker build -t $REGISTRY/$IMAGE:$VERSION-$ARCH --build-arg VERSION=$VERSION ./$IMAGE
4750
echo "Pushing image $REGISTRY/$IMAGE:$VERSION-$ARCH"
4851
docker push $REGISTRY/$IMAGE:$VERSION-$ARCH
4952
done

‎images/docker-elasticsearch-curator/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM python:3-alpine3.7
22

3-
RUN pip install -U --quiet elasticsearch-curator==5.5.1
3+
ARG VERSION
4+
ENV CURATOR_VERSION=$VERSION
5+
6+
RUN pip install -U --quiet elasticsearch-curator=="${CURATOR_VERSION}"
47

58
ENTRYPOINT [ "/usr/local/bin/curator" ]

‎images/docker-elasticsearch-kubernetes/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM carlosedp/docker-elasticsearch:6.2.3-arm64
1+
ARG VERSION
2+
FROM carlosedp/docker-elasticsearch:$VERSION-arm64
23

34
# Override config, otherwise plug-in install will fail
45
ADD config /elasticsearch/config

‎images/docker-elasticsearch-kubernetes/config/elasticsearch.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ discovery:
3232
minimum_master_nodes: ${NUMBER_OF_MASTERS}
3333

3434
xpack.license.self_generated.type: basic
35+
xpack.ml.enabled: false

‎images/docker-elasticsearch/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ FROM carlosedp/debian-oraclejava:8-172-arm64
22

33
ENV JAVA_HOME=/opt/java
44

5-
# Export HTTP & Transport
6-
EXPOSE 9200 9300
7-
8-
ENV ES_VERSION 6.2.3
5+
ARG VERSION
6+
ENV ES_VERSION=$VERSION
97

108
ENV DOWNLOAD_URL "https://artifacts.elastic.co/downloads/elasticsearch"
119
ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz"
@@ -73,4 +71,7 @@ ENV REPO_LOCATIONS []
7371
# Volume for Elasticsearch data
7472
VOLUME ["/data"]
7573

74+
# Export HTTP & Transport
75+
EXPOSE 9200 9300
76+
7677
CMD ["/run.sh"]

‎images/docker-elasticsearch/config/elasticsearch.yml

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ http:
2929
discovery:
3030
zen:
3131
minimum_master_nodes: ${NUMBER_OF_MASTERS}
32+
33+
xpack.ml.enabled: false

‎images/docker-elasticsearch/run.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,16 @@ if [ ! -z "${SHARD_ALLOCATION_AWARENESS_ATTR}" ]; then
4747
fi
4848
fi
4949

50+
# remove x-pack-ml module
51+
#rm -rf /elasticsearch/modules/x-pack/x-pack-ml
52+
5053
# run
5154
if [[ $(whoami) == "root" ]]; then
5255
chown -R elasticsearch:elasticsearch $BASE
5356
chown -R elasticsearch:elasticsearch /data
5457
exec gosu elasticsearch $BASE/bin/elasticsearch
5558
else
56-
# the container's first process is not running as 'root',
59+
# the container's first process is not running as 'root',
5760
# it does not have the rights to chown. however, we may
5861
# assume that it is being ran as 'elasticsearch', and that
5962
# the volumes already have the right permissions. this is

‎images/docker-kibana/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
FROM alpine:3.6
22

3-
ENV KIBANA_VERSION 6.2.3
3+
ARG VERSION
4+
ENV KIBANA_VERSION=$VERSION
5+
46
ENV LOGTRAIL_VERSION 0.1.27
57

68
RUN apk --update add curl && \
@@ -14,7 +16,8 @@ RUN apk --update add curl && \
1416
apk del curl && \
1517
rm -rf /var/cache/apk/*
1618

17-
RUN /opt/kibana/bin/kibana-plugin install https://github.com/sivasamyk/logtrail/releases/download/v${LOGTRAIL_VERSION}/logtrail-${KIBANA_VERSION}-${LOGTRAIL_VERSION}.zip
19+
# Logtrail not available for 6.3
20+
#RUN /opt/kibana/bin/kibana-plugin install https://github.com/sivasamyk/logtrail/releases/download/v${LOGTRAIL_VERSION}/logtrail-${KIBANA_VERSION}-${LOGTRAIL_VERSION}.zip
1821

1922
ADD ./run.sh /run.sh
2023

‎images/elasticsearch-cerebro/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ FROM carlosedp/debian-oraclejava:8-172-arm64
22

33
ENV JAVA_HOME=/opt/java
44

5-
ENV CEREBRO_VERSION 0.7.3
5+
ARG VERSION
6+
ENV CEREBRO_VERSION=$VERSION
7+
68
RUN cd /opt/ \
79
&& apt-get update -q \
810
&& apt-get install -q -y --no-install-recommends ca-certificates curl \

‎kibana.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
serviceAccount: elk
2020
containers:
2121
- name: kibana
22-
image: carlosedp/docker-kibana:6.2.3
22+
image: carlosedp/docker-kibana:6.3.0
2323
env:
2424
- name: KIBANA_ES_URL
2525
value: "http://elasticsearch:9200"
@@ -50,7 +50,7 @@ spec:
5050
- name : logtrail-config
5151
configMap:
5252
name: kibana-config
53-
items:
53+
items:
5454
- key: logtrail.json
5555
path: logtrail.json
5656

0 commit comments

Comments
 (0)