Skip to content

Commit ca521b7

Browse files
author
apedik
committed
magento 2.4.6-p2
opensearch php82
1 parent 8ac3aa9 commit ca521b7

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

docker/nginx/m-hosts.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ map $http_host $root_subfolder {
3939
map $http_host $PHP_HOSTM2 {
4040
hostnames;
4141

42-
eg-m2-opensource.loc php81;
42+
eg-m2-opensource.loc php82;
4343
eg-m2-commerce.loc php81;
4444
phpmyadmin.loc php82;
4545
docker-stack-ui.loc php82;

docker/opensearch/2.5/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM opensearchproject/opensearch:2.5.0
2+
# Install analysis-icu plugin
3+
#RUN /usr/share/opensearch/bin/opensearch-plugin install analysis-icu
4+
# Install analysis-phonetic plugin
5+
#RUN /usr/share/opensearch/bin/opensearch-plugin install analysis-phonetic

docker/services.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,21 @@ services:
123123
soft: -1
124124
hard: -1
125125

126+
opensearch25:
127+
build:
128+
context: ./opensearch/2.5
129+
environment:
130+
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
131+
- node.name=opensearch25
132+
- discovery.type=single-node
133+
- bootstrap.memory_lock=true
134+
- plugins.security.disabled=true
135+
- network.host=0.0.0.0
136+
ulimits:
137+
memlock:
138+
soft: -1
139+
hard: -1
140+
126141
kibana:
127142
container_name: kibana
128143
image: docker.elastic.co/kibana/kibana:7.13.0

project/m2_opensource

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ source "./docker/.env"; # Enable access to the Docker e
2222
repo_type='github'; # 'github' or 'bitbucket'
2323
cvs_organisation='magento'; # the organisation name for Github or Bitbucket
2424
project_name='magento2'; # Name as used in Github or Bitbucket
25-
cvs_branch="2.4.5-p2";
25+
cvs_branch="2.4.6-p2";
2626
github_args='--depth 1';
2727
resources_storage='local'; # Where to access shared resources (see README.md), 'local' or 's3'
2828
db_host='mysql80'; # 'percona56' or 'percona57'
29-
php_host='php81'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
30-
required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch7" "${php_host}" "${db_host}");
29+
php_host='php82'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
30+
required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "opensearch25" "${php_host}" "${db_host}");
3131
composer_version="2";
3232
db_name='example_m2_opensource'; # unique name for this database
3333
vmhost_name='eg-m2-opensource.loc'; # domain name for this project in local vm.

project/resources/eg-m2-opensource.loc/configurator/Configuration/global.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ global:
1010
value: 0
1111
-
1212
path: catalog/search/engine
13-
value: elasticsearch7
13+
value: opensearch
1414
-
15-
path: catalog/search/elasticsearch7_server_hostname
16-
value: elasticsearch7
15+
path: catalog/search/opensearch_server_hostname
16+
value: opensearch25
1717
-
18-
path: catalog/search/elasticsearch7_server_port
18+
path: catalog/search/opensearch_server_port
1919
value: 9200
2020
-
21-
path: catalog/search/elasticsearch7_enable_auth
21+
path: catalog/search/opensearch_enable_auth
2222
value: 0
2323
-
24-
path: catalog/search/elasticsearch7_server_timeout
24+
path: catalog/search/opensearch_server_timeout
2525
value: 15

0 commit comments

Comments
 (0)