Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test #1

Open
wants to merge 12 commits into
base: i4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -197,13 +208,13 @@ curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/te
cp -R ~/Sites/existing src
# or: git clone [email protected]: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

Expand Down
1 change: 1 addition & 0 deletions compose/bin/setup-install
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion compose/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
volumes: *appvolumes

phpmyadmin:
image: phpmyadmin/phpmyadmin
image: linuxserver/phpmyadmin
env_file: env/db.env
ports:
- "8080:80"
Expand Down