Skip to content

Commit 8725939

Browse files
amanKumar-15amanKumar-15
committed
MCLOUD-13768: Merged latest develop
2 parents b7dd557 + d052b04 commit 8725939

File tree

104 files changed

+530
-1475
lines changed

Some content is hidden

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

104 files changed

+530
-1475
lines changed

‎config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\DbQuote" />
2525
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\DbSales" />
2626
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Redis" />
27+
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Valkey" />
2728
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\ElasticSearch" />
2829
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\OpenSearch" />
2930
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Fpm" />

‎images/opensearch/1.3/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
FROM opensearchproject/opensearch:1.3.0
22

3-
USER root
4-
RUN yum -y install zip && \
5-
zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
6-
yum remove -y zip && \
7-
yum -y clean all && \
8-
rm -rf /var/cache
93
USER opensearch
104

115
RUN bin/opensearch-plugin install -b analysis-icu && \

‎images/opensearch/2.12/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
FROM opensearchproject/opensearch:2.12.0
22

3-
USER root
4-
RUN yum -y install zip && \
5-
zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
6-
yum remove -y zip && \
7-
yum -y clean all && \
8-
rm -rf /var/cache
93
USER opensearch
104

115
RUN bin/opensearch-plugin install -b analysis-icu && \

‎images/opensearch/2.3/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
FROM opensearchproject/opensearch:2.3.0
22

3-
USER root
4-
RUN yum -y install zip && \
5-
zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
6-
yum remove -y zip && \
7-
yum -y clean all && \
8-
rm -rf /var/cache
93
USER opensearch
104

115
RUN bin/opensearch-plugin install -b analysis-icu && \

‎images/opensearch/2.4/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
FROM opensearchproject/opensearch:2.4.0
22

3-
USER root
4-
RUN yum -y install zip && \
5-
zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
6-
yum remove -y zip && \
7-
yum -y clean all && \
8-
rm -rf /var/cache
93
USER opensearch
104

115
RUN bin/opensearch-plugin install -b analysis-icu && \

‎images/opensearch/2.5/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
FROM opensearchproject/opensearch:2.5.0
22

3-
USER root
4-
RUN yum -y install zip && \
5-
zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
6-
yum remove -y zip && \
7-
yum -y clean all && \
8-
rm -rf /var/cache
93
USER opensearch
104

115
RUN bin/opensearch-plugin install -b analysis-icu && \

‎images/opensearch/3.0/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM opensearchproject/opensearch:3.0.0
2+
3+
USER opensearch
4+
5+
RUN bin/opensearch-plugin install -b analysis-icu && \
6+
bin/opensearch-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

‎images/opensearch/3.0/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 [[ -n "$OS_PLUGINS" ]]; then
5+
echo "Installing plugins: $OS_PLUGINS"
6+
for PLUGIN in $OS_PLUGINS
7+
do
8+
./bin/opensearch-plugin install -b "$PLUGIN"
9+
done
10+
fi
11+
12+
/bin/bash /usr/share/opensearch/opensearch-docker-entrypoint.sh

‎images/opensearch/3.0/docker-healthcheck.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://${OS_HOST:-opensearch}:${OS_HOST:-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

‎images/php/7.4-cli/Dockerfile

Lines changed: 0 additions & 225 deletions
This file was deleted.

0 commit comments

Comments
 (0)