Skip to content

Commit 9d212e1

Browse files
authored
Merge pull request #1063 from electricpulp/update-to-magento-2.4.6-p4
2 parents f2b419b + b44ac20 commit 9d212e1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ mkdir -p ~/Sites/magento
134134
cd $_
135135

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

140-
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.
140+
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.
141141

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

@@ -165,10 +165,10 @@ cd $_
165165
curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash
166166

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

173173
# or for Magento core development:
174174
# bin/start --no-dev
@@ -282,7 +282,7 @@ It is recommended to keep your root docker config files in one repository, and y
282282
- `bin/dev-urn-catalog-generate`: Generate URN's for PhpStorm and remap paths to local host. Restart PhpStorm after running this command.
283283
- `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
284284
- `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`
285-
- `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`
285+
- `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`
286286
- `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`
287287
- `bin/deploy`: Runs the standard Magento deployment process commands. Pass extra locales besides `en_US` via an optional argument. Ex. `bin/deploy nl_NL`
288288
- `bin/docker-stats`: Display status for CPU, memory usage, and memory limit of currently-running Docker containers.
@@ -601,7 +601,7 @@ To use it:
601601
602602
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.
603603
604-
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.
604+
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.
605605
606606
### MFTF
607607

compose/bin/download

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
VERSION=${1:-2.4.6-p3}
3+
VERSION=${1:-2.4.6-p4}
44
EDITION=${2:-community}
55

66
# Define ANSI escape codes for colors

lib/onelinesetup

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -o errexit
33

44
DOMAIN=${1:-magento.test}
5-
VERSION=${2:-2.4.6-p3}
5+
VERSION=${2:-2.4.6-p4}
66
EDITION=${3:-community}
77

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

0 commit comments

Comments
 (0)