From d0a08cdd66f7083dbf54442003e8ac8cd0cf5359 Mon Sep 17 00:00:00 2001 From: kruchyns Date: Wed, 21 Dec 2022 15:54:01 -0600 Subject: [PATCH 1/2] Changed m2install.sh repository to magento-sparta fork --- env/etc/php/7.3/Dockerfile | 2 +- env/etc/php/7.4/Dockerfile | 2 +- env/etc/php/8.0/Dockerfile | 2 +- env/etc/php/8.1/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/env/etc/php/7.3/Dockerfile b/env/etc/php/7.3/Dockerfile index 99672f1..745e460 100644 --- a/env/etc/php/7.3/Dockerfile +++ b/env/etc/php/7.3/Dockerfile @@ -148,7 +148,7 @@ COPY ./etc/fixtures /etc/fixtures COPY ./etc/m2install/.m2install.conf* ${_HOME_DIRECTORY}/ #MAGENTO TOOLS -RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install.sh \ +RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/magento-sparta/m2install/master/m2install.sh \ && curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion \ && curl -o /usr/local/bin/n98-magerun2 https://files.magerun.net/n98-magerun2.phar \ && curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash \ diff --git a/env/etc/php/7.4/Dockerfile b/env/etc/php/7.4/Dockerfile index b15989a..f35d8b4 100644 --- a/env/etc/php/7.4/Dockerfile +++ b/env/etc/php/7.4/Dockerfile @@ -155,7 +155,7 @@ COPY ./etc/fixtures /etc/fixtures COPY ./etc/m2install/.m2install.conf* ${_HOME_DIRECTORY}/ #MAGENTO TOOLS -RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install.sh \ +RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/magento-sparta/m2install/master/m2install.sh \ && curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion \ && curl -o /usr/local/bin/n98-magerun2 https://files.magerun.net/n98-magerun2.phar \ && curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash \ diff --git a/env/etc/php/8.0/Dockerfile b/env/etc/php/8.0/Dockerfile index a23a670..d8b107b 100644 --- a/env/etc/php/8.0/Dockerfile +++ b/env/etc/php/8.0/Dockerfile @@ -153,7 +153,7 @@ COPY ./etc/fixtures /etc/fixtures COPY ./etc/m2install/.m2install.conf* ${_HOME_DIRECTORY}/ #MAGENTO TOOLS -RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install.sh \ +RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/magento-sparta/m2install/master/m2install.sh \ && curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion \ && curl -o /usr/local/bin/n98-magerun2 https://files.magerun.net/n98-magerun2.phar \ && curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash \ diff --git a/env/etc/php/8.1/Dockerfile b/env/etc/php/8.1/Dockerfile index a386150..da64c1e 100644 --- a/env/etc/php/8.1/Dockerfile +++ b/env/etc/php/8.1/Dockerfile @@ -154,7 +154,7 @@ COPY ./etc/fixtures /etc/fixtures COPY ./etc/m2install/.m2install.conf* ${_HOME_DIRECTORY}/ #MAGENTO TOOLS -RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install.sh \ +RUN curl -o /usr/local/bin/m2install.sh https://raw.githubusercontent.com/magento-sparta/m2install/master/m2install.sh \ && curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion \ && curl -o /usr/local/bin/n98-magerun2 https://files.magerun.net/n98-magerun2.phar \ && curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash \ From 924702c6865cae00949af4c75c662b0b75ee91c7 Mon Sep 17 00:00:00 2001 From: kruchyns Date: Mon, 23 Jan 2023 22:49:56 -0600 Subject: [PATCH 2/2] Added Opensearch --- env/Makefile | 6 ++++++ env/additional/opensearch/docker-compose.yml | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 env/additional/opensearch/docker-compose.yml diff --git a/env/Makefile b/env/Makefile index c5235a9..3a7326e 100644 --- a/env/Makefile +++ b/env/Makefile @@ -133,6 +133,12 @@ logs-elastic7: docker logs -f magento2elastic7 elastic7-stop: cd additional/elasticsearch7 && docker-compose stop && cd - +opensearch-stop: + cd additional/opensearch && docker-compose stop && cd - +opensearch: + cd additional/opensearch && docker-compose up -d && cd - +logs-opensearch: + docker logs -f magento2opensearch selenium: cd additional/selenium && docker-compose up -d && cd - # VNC open vnc://:secret@127.0.0.1:5900 diff --git a/env/additional/opensearch/docker-compose.yml b/env/additional/opensearch/docker-compose.yml new file mode 100644 index 0000000..f081c56 --- /dev/null +++ b/env/additional/opensearch/docker-compose.yml @@ -0,0 +1,16 @@ +version: '2' + +services: + opensearch: + container_name: magento2opensearch + environment: + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - "discovery.type=single-node" + - "plugins.security.disabled=true" + build: opensearchproject/opensearch:1.2.4 + ports: + - "9200:9200" +networks: + default: + external: + name: env_default