Skip to content

Commit 6db4dff

Browse files
authored
MCLOUD-2789: Add custom ES plugins (#279)
1 parent 65b49b4 commit 6db4dff

33 files changed

+340
-26
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/composer.lock
66
/auth.json
77
/_workdir
8+
.phpunit.result.cache

images/elasticsearch/5.2/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:5.2.2
22

33
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
4+
45
RUN bin/elasticsearch-plugin install analysis-icu && \
56
bin/elasticsearch-plugin install analysis-phonetic
67

images/elasticsearch/5.2/docker-healthcheck.sh

100755100644
File mode changed.

images/elasticsearch/6.5/Dockerfile

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

33
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
4-
RUN bin/elasticsearch-plugin install analysis-icu && \
5-
bin/elasticsearch-plugin install analysis-phonetic
4+
5+
RUN bin/elasticsearch-plugin install -b analysis-icu && \
6+
bin/elasticsearch-plugin install -b analysis-phonetic
67

78
ADD docker-healthcheck.sh /docker-healthcheck.sh
9+
ADD docker-entrypoint.sh /docker-entrypoint.sh
810

911
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
1012

13+
ENTRYPOINT ["/docker-entrypoint.sh"]
14+
1115
EXPOSE 9200 9300
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
if [[ -n "$ES_PLUGINS" ]]; then
5+
echo "Intalling plugins: $ES_PLUGNS"
6+
for PLUGIN in $ES_PLUGINS
7+
do
8+
./bin/elasticsearch-plugin install -b "$PLUGIN"
9+
done
10+
fi
11+
12+
/bin/bash /usr/local/bin/docker-entrypoint.sh

images/elasticsearch/6.5/docker-healthcheck.sh

100755100644
File mode changed.

images/elasticsearch/6.8/Dockerfile

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ RUN bin/elasticsearch-plugin install -b analysis-icu && \
66
bin/elasticsearch-plugin install -b analysis-phonetic
77

88
ADD docker-healthcheck.sh /docker-healthcheck.sh
9+
ADD docker-entrypoint.sh /docker-entrypoint.sh
910

1011
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
1112

13+
ENTRYPOINT ["/docker-entrypoint.sh"]
14+
1215
EXPOSE 9200 9300
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
if [[ -n "$ES_PLUGINS" ]]; then
5+
echo "Intalling plugins: $ES_PLUGNS"
6+
for PLUGIN in $ES_PLUGINS
7+
do
8+
./bin/elasticsearch-plugin install -b "$PLUGIN"
9+
done
10+
fi
11+
12+
/bin/bash /usr/local/bin/docker-entrypoint.sh

images/elasticsearch/6.8/docker-healthcheck.sh

100755100644
File mode changed.

images/elasticsearch/7.5/Dockerfile

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ RUN bin/elasticsearch-plugin install -b analysis-icu && \
66
bin/elasticsearch-plugin install -b analysis-phonetic
77

88
ADD docker-healthcheck.sh /docker-healthcheck.sh
9+
ADD docker-entrypoint.sh /docker-entrypoint.sh
910

1011
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
1112

13+
ENTRYPOINT ["/docker-entrypoint.sh"]
14+
1215
EXPOSE 9200 9300

0 commit comments

Comments
 (0)