Skip to content

Commit 229ad4c

Browse files
BaDosBaDos
authored
MACI-1446: Remove JndiLookup (#77)
1 parent 7eb25ed commit 229ad4c

File tree

10 files changed

+72
-2
lines changed

10 files changed

+72
-2
lines changed

‎images/elasticsearch/5.2/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
FROM docker.elastic.co/elasticsearch/elasticsearch:5.2.2
1+
FROM elasticsearch:5.2.2
22

3-
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
3+
RUN apt update || true \
4+
&& apt install zip
5+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
46

57
RUN bin/elasticsearch-plugin install analysis-icu && \
68
bin/elasticsearch-plugin install analysis-phonetic
79

810
ADD docker-healthcheck.sh /docker-healthcheck.sh
911

12+
ADD docker-entrypoint.sh /docker-entrypoint.sh
13+
1014
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
1115

1216
EXPOSE 9200 9300

‎images/elasticsearch/5.2/docker-entrypoint.sh

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Add elasticsearch as command if needed
6+
if [ "${1:0:1}" = '-' ]; then
7+
set -- elasticsearch "$@"
8+
fi
9+
10+
# Drop root privileges if we are running elasticsearch
11+
# allow the container to be started with `--user`
12+
if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
13+
# Change the ownership of user-mutable directories to elasticsearch
14+
for path in \
15+
/usr/share/elasticsearch/data \
16+
/usr/share/elasticsearch/logs \
17+
; do
18+
chown -R elasticsearch:elasticsearch "$path"
19+
done
20+
21+
es_opts=''
22+
23+
while IFS='=' read -r envvar_key envvar_value
24+
do
25+
# Elasticsearch env vars need to have at least two dot separated lowercase words, e.g. `cluster.name`
26+
if [[ "$envvar_key" =~ ^[a-z]+\.[a-z]+ ]]
27+
then
28+
if [[ ! -z $envvar_value ]]; then
29+
es_opt="-E${envvar_key}=${envvar_value}"
30+
es_opts+=" ${es_opt}"
31+
fi
32+
fi
33+
done < <(env)
34+
35+
set -- gosu elasticsearch "$@" ${es_opts}
36+
#exec gosu elasticsearch "$BASH_SOURCE" "$@"
37+
fi
38+
39+
# As argument is not related to elasticsearch,
40+
# then assume that user wants to run his own process,
41+
# for example a `bash` shell to explore this image
42+
exec "$@"

‎images/elasticsearch/6.5/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47

58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/6.8/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/7.11/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/7.5/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/7.6/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.6.2
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/7.7/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.1
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/7.9/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.3
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

‎images/elasticsearch/es/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:{%version%}
22

3+
RUN yum -y install zip
4+
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
5+
36
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
47
{%single_node%}
58
RUN bin/elasticsearch-plugin install -b analysis-icu && \

0 commit comments

Comments
 (0)