Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 64a84ca

Browse files
committed
Merge branch '2.3.7-develop' into 2.4.3-develop
2 parents 07d126e + 1901828 commit 64a84ca

31 files changed

+225
-58
lines changed

src/_data/toc/contributor-guide.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ pages:
4242
- label: Maintainers
4343
url: /contributor-guide/maintainers.html
4444
versionless: true
45+
children:
46+
- label: Maintainer's Handbook
47+
url: /contributor-guide/maintainer-handbook.html
48+
versionless: true

src/_includes/graphql/store-config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Attribute | Data Type | Description | Default or example value
2525
`cms_no_cookies` | String | Identifies a specific CMS page that appears when cookies are not enabled for the browser | `enable-cookies`
2626
`cms_no_route` | String | Identifies a specific CMS page that you want to appear when a 404 “Page Not Found” error occurs | `no-route`
2727
`code` | String | Deprecated. Use `store_code` instead. A unique identifier for the store | `default`
28+
`configurable_thumbnail_source` | String | Determines which thumbnail should be used in the cart for configurable products. Possible values: `parent` or `itself` (child) | `parent`
2829
`copyright` | String | The copyright statement that appears at the bottom of each page | Copyright © 2013-present Magento, Inc. All rights reserved.
2930
`default_description` | String | The description that provides a summary of your site for search engine listings and should not be more than 160 characters in length | null
3031
`default_display_currency_code` | String | The code representing the currency displayed on the store | `USD`

src/cloud/project/magento-app-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ This example shows the default web configuration for a Cloud project configured
146146
Defines the persistent disk size of the application in MB.
147147

148148
```yaml
149-
disk: 2048
149+
disk: 5120
150150
```
151151

152152
The minimal recommended disk size is 256MB. If you see the error `UserError: Error building the project: Disk size may not be smaller than 128MB`, increase the size to 256MB.

src/cloud/project/manage-disk-space.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ magento-cloud mount:size
4040
Sample response:
4141

4242
```terminal
43-
Checking disk usage for all mounts on <project>-<branch>-mymagento@ssh.us.magento.cloud...
43+
Checking disk usage for all mounts on <project>-<environment>-mymagento@ssh.us.magento.cloud...
4444
4545
+------------+-----------+---------+-----------+-----------+--------+
4646
| Mount(s) | Size(s) | Disk | Used | Available | % Used |
@@ -170,4 +170,4 @@ magento-cloud project:clear-build-cache
170170

171171
<!-- link definitions -->
172172

173-
[disk-key]: {{ site.baseurl }}/cloud/project/magento-app-properties.html#disk
173+
[disk-key]: {{ site.baseurl }}/cloud/project/magento-app-properties.html#disk

src/cloud/project/services-mysql.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MariaDB 10.1 is the last version that support XtraDB as the storage engine. Vers
2525
```yaml
2626
mysql:
2727
type: mysql:<version>
28-
disk: 2048
28+
disk: 5120
2929
```
3030
3131
{:.bs-callout-tip}
@@ -69,8 +69,8 @@ If no endpoints are defined, a single endpoint named `mysql` has `admin` access
6969

7070
```yaml
7171
mysql:
72-
type: mysql:10.2
73-
disk: 2048
72+
type: mysql:10.3
73+
disk: 5120
7474
configuration:
7575
schemas:
7676
- main

src/cloud/project/services.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can view default versions and disk values in the current, [default `services
3333
```yaml
3434
mysql:
3535
type: mysql:<version>
36-
disk: 2048
36+
disk: 5120
3737

3838
redis:
3939
type: redis:<version>
@@ -88,7 +88,7 @@ The `type` value specifies the service name and version. For example:
8888

8989
```yaml
9090
mysql:
91-
type: mysql:10.2
91+
type: mysql:10.3
9292
```
9393

9494
Use [`Service versions`](#service-versions) table to see supported services and their versions
@@ -99,8 +99,8 @@ The `disk` value specifies the size of the persistent disk storage (in MB) to al
9999

100100
```yaml
101101
mysql:
102-
type: mysql:10.2
103-
disk: 2048
102+
type: mysql:10.3
103+
disk: 5120
104104
```
105105

106106
The current default storage amount per project is 5GB, or 5120MB. You can distribute this amount between your application and each of its services.
@@ -138,7 +138,7 @@ To verify relationships in local environment:
138138
database:
139139
-
140140
...
141-
type: 'mysql:10.2'
141+
type: 'mysql:10.3'
142142
port: 3306
143143
```
144144

@@ -218,7 +218,7 @@ You can upgrade the installed service version by updating the service configurat
218218
```yaml
219219
mysql:
220220
type: mysql:10.3
221-
disk: 2048
221+
disk: 5120
222222
```
223223

224224
1. Add, commit, and push your code changes.
@@ -260,15 +260,15 @@ To downgrade a service version by renaming an existing service:
260260
```yaml
261261
mysql:
262262
type: mysql:10.4
263-
disk: 2048
263+
disk: 5120
264264
```
265265

266266
> New `services.yaml` definition
267267

268268
```yaml
269269
mysql2:
270270
type: mysql:10.3
271-
disk: 2048
271+
disk: 5120
272272
```
273273

274274
1. Update the relationships in the `.magento.app.yaml` file.
@@ -299,10 +299,10 @@ To downgrade a service by creating an additional service:
299299
```yaml
300300
mysql:
301301
type: mysql:10.4
302-
disk: 2048
302+
disk: 5120
303303
mysql2:
304304
type: mysql:10.3
305-
disk: 2048
305+
disk: 5120
306306
```
307307

308308
1. Change the relationships configuration in the `.magento.app.yaml` file to use the new service.
81.4 KB
Loading
109 KB
Loading
63.7 KB
Loading
Loading

0 commit comments

Comments
 (0)