From b44ac20caf0e22122d1c322ccdb9995dfd43a013 Mon Sep 17 00:00:00 2001 From: Michael Lehmkuhl Date: Tue, 13 Feb 2024 10:15:04 -0600 Subject: [PATCH] Update default Magento version to 2.4.6-p4 --- README.md | 12 ++++++------ compose/bin/download | 2 +- lib/onelinesetup | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e3d22bad9..5c69c49d8 100644 --- a/README.md +++ b/README.md @@ -134,10 +134,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-p3 community +curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.6-p4 community ``` -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. +The `magento.test` above defines the hostname to use, and the `2.4.6-p4` 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`. @@ -165,10 +165,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-p3 community +bin/download 2.4.6-p4 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-p3" and "community" are the default values used. +# If no arguments are passed, "2.4.6-p4" and "community" are the default values used. # or for Magento core development: # bin/start --no-dev @@ -282,7 +282,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-p3 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p3 enterprise` +- `bin/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.6-p4 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p4 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/deploy`: Runs the standard Magento deployment process commands. Pass extra locales besides `en_US` via an optional argument. Ex. `bin/deploy nl_NL` - `bin/fixowns`: This will fix filesystem ownerships within the container. @@ -598,7 +598,7 @@ To use it: In Cloudflare Tunnel configuration, configure the service URL to use type `HTTPS` and a URL of `{name of app container}:{HTTPS port of app container}`. For examplem, `demo-app-1:8443`. Enable the `No TLS Verify` option, since our local certificates are self-signed. You should now be able to access your app via the public hostname defined in Cloudflare Tunnel. -NOTE: Do not leave instances with Cloudflare Tunnel enabled running long-term, as your instance is publicly available to the world. You should ideally turn off tunnel container once testing is finished. +NOTE: Do not leave instances with Cloudflare Tunnel enabled running long-term, as your instance is publicly available to the world. You should ideally turn off tunnel container once testing is finished. ### MFTF diff --git a/compose/bin/download b/compose/bin/download index c8a2c5bf7..4daf08019 100755 --- a/compose/bin/download +++ b/compose/bin/download @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION=${1:-2.4.6-p3} +VERSION=${1:-2.4.6-p4} EDITION=${2:-community} bin/stop diff --git a/lib/onelinesetup b/lib/onelinesetup index 1d76ba343..d802f4593 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -2,7 +2,7 @@ set -o errexit DOMAIN=${1:-magento.test} -VERSION=${2:-2.4.6-p3} +VERSION=${2:-2.4.6-p4} EDITION=${3:-community} curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash