Skip to content

Commit 09872ff

Browse files
authored
Merge pull request #12 from magento-commerce/develop
MCLOUD-7202: Release magento-cloud-docker 1.2.0 and ece-tools 2002.1.3
2 parents 3f17821 + 656fb1c commit 09872ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+745
-197
lines changed

images/elasticsearch/7.9/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.3
2+
3+
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
4+
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
5+
RUN bin/elasticsearch-plugin install -b analysis-icu && \
6+
bin/elasticsearch-plugin install -b analysis-phonetic
7+
8+
ADD docker-healthcheck.sh /docker-healthcheck.sh
9+
ADD docker-entrypoint.sh /docker-entrypoint.sh
10+
11+
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
12+
13+
ENTRYPOINT ["/docker-entrypoint.sh"]
14+
15+
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
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 health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
5+
health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
6+
if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
7+
exit 0
8+
fi
9+
echo >&2 "Unexpected health status: $health"
10+
fi
11+
12+
exit 1
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)