diff --git a/README.md b/README.md index 2ad061741..334988882 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,17 @@ bin/download 2.4.6 community # bin/cli git checkout 2.4-develop # bin/composer install +# Want to install Magento <2.4.6? In bin/setup-install, replace the lines: +# --elasticsearch-host="$ES_HOST" \ +# --elasticsearch-port="$ES_PORT" \ +# --opensearch-host="$OPENSEARCH_HOST" \ +# --opensearch-port="$OPENSEARCH_PORT" \ +# --search-engine=opensearch \ +# with: +# --elasticsearch-host="$OPENSEARCH_HOST" \ +# --elasticsearch-port="$OPENSEARCH_PORT" \ +# --search-engine=elasticsearch7 \ + # Run the setup installer for Magento: bin/setup magento.test @@ -197,13 +208,13 @@ curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/te cp -R ~/Sites/existing src # or: git clone git@github.com:myrepo.git src -# If your vendor directory was empty, populate it with: -bin/composer install - # Start some containers, copy files to them and then restart the containers: bin/start --no-dev bin/copytocontainer --all ## Initial copy will take a few minutes... +# If your vendor directory was empty, populate it with: +bin/composer install + # Import existing database: bin/mysql < ../existing/magento.sql diff --git a/compose/bin/setup-install b/compose/bin/setup-install index cac1ba9fc..fdd1251a7 100755 --- a/compose/bin/setup-install +++ b/compose/bin/setup-install @@ -51,5 +51,6 @@ bin/clinotty bin/magento setup:install \ --elasticsearch-port="$ES_PORT" \ --opensearch-host="$OPENSEARCH_HOST" \ --opensearch-port="$OPENSEARCH_PORT" \ + --search-engine=opensearch \ --use-rewrites=1 \ --no-interaction diff --git a/compose/compose.dev.yaml b/compose/compose.dev.yaml index 4aa8491fc..44d2d5114 100644 --- a/compose/compose.dev.yaml +++ b/compose/compose.dev.yaml @@ -24,7 +24,7 @@ services: volumes: *appvolumes phpmyadmin: - image: phpmyadmin/phpmyadmin + image: linuxserver/phpmyadmin env_file: env/db.env ports: - "8080:80"