Skip to content

Commit

Permalink
Merge pull request #1001 from cosmicvibes/master
Browse files Browse the repository at this point in the history
  • Loading branch information
markshust authored Nov 21, 2023
2 parents 65e1f5a + 9ddf4a9 commit a1fbfdf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ mkdir -p ~/Sites/magento
cd $_

# Run this automated one-liner from the directory you want to install your project.
curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.6-p2 community
curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.6-p3 community
```

The `magento.test` above defines the hostname to use, and the `2.4.6-p2` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.
The `magento.test` above defines the hostname to use, and the `2.4.6-p3` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.

After the one-liner above completes running, you should be able to access your site at `https://magento.test`.

Expand Down Expand Up @@ -162,10 +162,10 @@ cd $_
curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash

# Download the version of Magento you want to use with:
bin/download 2.4.6-p2 community
bin/download 2.4.6-p3 community
# You can specify the version and type (community, enterprise, mageos, mageos-nightly, mageos-mirror, mageos-hypernode-mirror, or mageos-maxcluster-mirror).
# The mageos type is an alias for mageos-mirror.
# If no arguments are passed, "2.4.6-p2" and "community" are the default values used.
# If no arguments are passed, "2.4.6-p3" and "community" are the default values used.

# or for Magento core development:
# bin/start --no-dev
Expand Down Expand Up @@ -279,7 +279,7 @@ It is recommended to keep your root docker config files in one repository, and y
- `bin/dev-urn-catalog-generate`: Generate URN's for PhpStorm and remap paths to local host. Restart PhpStorm after running this command.
- `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
- `bin/docker-compose`: Support V1 (`docker-compose`) and V2 (`docker compose`) docker compose command, and use custom configuration files, such as `compose.yml` and `compose.dev.yml`
- `bin/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.6-p2 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p2 enterprise`
- `bin/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.6-p3 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p3 enterprise`
- `bin/debug-cli`: Enable Xdebug for bin/magento, with an optional argument of the IDE key. Defaults to PHPSTORM Ex. `bin/debug-cli enable PHPSTORM`
- `bin/fixowns`: This will fix filesystem ownerships within the container.
- `bin/fixperms`: This will fix filesystem permissions within the container.
Expand Down
2 changes: 1 addition & 1 deletion compose/bin/download
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

VERSION=${1:-2.4.6-p2}
VERSION=${1:-2.4.6-p3}
EDITION=${2:-community}

bin/stop
Expand Down
2 changes: 1 addition & 1 deletion lib/onelinesetup
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -o errexit

DOMAIN=${1:-magento.test}
VERSION=${2:-2.4.6-p2}
VERSION=${2:-2.4.6-p3}
EDITION=${3:-community}

curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash
Expand Down

0 comments on commit a1fbfdf

Please sign in to comment.