Skip to content

Commit f7d4065

Browse files
committed
Fix remaining broken links
1 parent 992bf0d commit f7d4065

File tree

8 files changed

+58
-10
lines changed

8 files changed

+58
-10
lines changed

sites/platform/src/create-apps/app-reference/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Manually defining a stack in a composable image is typically simpler than adding
3838

3939
Consider using a composable image when these factors are important:
4040
- Your application requires multiple runtimes and tools, or different versions of the same package.
41-
- You build your own services. See the [Building your own services](#building-services) section below.
41+
- You build your own services.
4242
- You want the ability to install _all_ the packages you need in your application container, ensuring that an application works on any machine.<BR>
4343
In a composable image, you can accomplish this by using supported Nix channels. This method ensures app consistency and helps to streamline the development, testing, and deployment processes.
4444

@@ -62,7 +62,7 @@ Consider using a composable image when these factors are important:
6262

6363
## Keys used in each image type
6464

65-
Only the single-runtime image supports the [``build``](/create-apps/app-reference/single-runtime-image.md#build), [``dependencies``](/create-apps/app-reference/single-runtime-image.md#dependencies), and [``runtime``](/create-apps/app-reference/single-runtime-image.md#druntime) keys. In a composable image, the equivalent is the [`stack`](/create-apps/app-reference/composable-image.md#stack) key.
65+
Only the single-runtime image supports the [``build``](/create-apps/app-reference/single-runtime-image.md#build), [``dependencies``](/create-apps/app-reference/single-runtime-image.md#dependencies), and [``runtime``](/create-apps/app-reference/single-runtime-image.md#runtime) keys. In a composable image, the equivalent is the [`stack`](/create-apps/app-reference/composable-image.md#stack) key.
6666

6767
Otherwise, the same keys are available for both image types. Differences in syntax or meaning are noted in each key's topic - see the [Image properties](/create-apps/image-properties.md) section for the topics that describe each key.
6868

sites/platform/src/create-apps/app-reference/single-runtime-image.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,36 @@ The following table shows the properties that can be set in `sizing_hints`:
212212
| `reserved_memory` | `integer` | 70 | 70 | The amount of memory reserved in MB. |
213213

214214
See more about [PHP-FPM workers and sizing](/languages/php/fpm.md).
215+
216+
## Combine single-runtime and composable images {#combine-single-runtime-and-composable-images}
217+
218+
In a [multiple application context](/create-apps/multi-app/_index.md),
219+
you can use a mix of single-runtime images and [composable images](/create-apps/app-reference/composable-image.md).
220+
221+
222+
The following sample configuration includes two applications:
223+
- ``frontend`` – uses a single-runtime image
224+
- ``backend`` – uses a composable image<br>
225+
In this app, PHP is the primary runtime and is started automatically (PHP-FPM also starts automatically when PHP is the primary runtime). For details, see the [PHP as a primary runtime](#php-as-a-primary-runtime) section in this topic.
226+
227+
228+
```yaml {configFile="app"}
229+
applications:
230+
frontend:
231+
# this app uses the single-runtime image with a specific node.js runtime
232+
type: 'nodejs:{{% latest "nodejs" %}}'
233+
backend:
234+
# this app uses the composable image and specifies two runtimes
235+
type: "composable:8.4"
236+
stack:
237+
runtimes:
238+
239+
extensions:
240+
- apcu
241+
- sodium
242+
- xsl
243+
- pdo_sqlite
244+
245+
packages:
246+
- "python313Packages.yq" # python package specific
247+
```

sites/platform/src/create-apps/image-properties/crons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ applications:
8686
8787
{{< /codetabs >}}
8888
89-
In this example configuration, the crons [`spec`](#crons) uses the `H` syntax.
89+
In this example configuration, the crons `spec` key uses the `H` syntax.
9090

9191
Note that this syntax is only supported on Grid projects.
9292
On {{% names/dedicated-gen-2 %}} projects, use the [standard cron syntax](https://en.wikipedia.org/wiki/Cron#Cron_expression).

sites/platform/src/create-apps/image-properties/disk.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Optional in [single-runtime](/create-apps/app-reference/single-runtime-image.md#
1010

1111
The maximum total space available to all apps and services is set by the storage in your plan settings.
1212
When deploying your project, the sum of all `disk` keys defined in app and service configurations
13-
must be *equal or less* than the plan storage size.
13+
cannot exceed the available storage in your plan.
1414

1515
So if your *plan storage size* is 5&nbsp;GB, you can, for example, assign it in one of the following ways:
1616

@@ -23,7 +23,10 @@ You need to either increase your plan's storage or decrease the `disk` values yo
2323

2424
You configure the disk size in [MB](/glossary/_index.md#mb). Your actual available disk space is slightly smaller with some space used for formatting and the filesystem journal. When checking available space, note whether it’s reported in MB or MiB.
2525

26-
### Altering `disk` values
26+
If you need more storage to fit the sum of all `disk` keys, it is necessary to [switch plans](/administration/pricing.md#switch-plans). This can only be done by people with the [manage plans permission](/administration/users.md#organization-permissions).
27+
28+
29+
### Backups and altering `disk` values
2730

2831
It's a best practice to [back up your environment](/environments/backup.md) **before and after** you increase **or** decrease the `disk` value (the amount of allocated storage space) of an app or service.
2932

sites/platform/src/create-apps/image-properties/workers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ title=Composable image
5757
5858
The keys of the `workers` definition are the names of the workers.
5959
You can then define how each worker differs from the `web` instance using
60-
the [top-level properties](#primary-application-properties).
60+
the [top-level properties](/create-apps/app-reference/composable-image.md#primary-application-properties).
6161

6262
Each worker can differ from the `web` instance in all properties _except_ for:
6363

sites/platform/src/create-apps/troubleshoot-disks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Error: Resources exceeding plan limit; disk: 8192.00MB > 5120.00MB; try removing
2323
To fix the error, do one of the following:
2424

2525
* Lower the `disk` parameters to a value within your plan's storage limits.
26-
Note the [limits to downsizing disks](/create-apps/app-reference/single-runtime-image.md#downsize-a-disk).
26+
Note the [limits to downsizing disks](/create-apps/image-properties/disk.md).
2727
* Increase your plan's storage limits.
2828
This can only be done by people with the [manage plans permission](/administration/users.md#organization-permissions).
2929

sites/platform/src/languages/php/_index.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,22 @@ See the example below for more details.
663663
| `extensions` | List of `string`s OR [extensions definitions](/create-apps/app-reference/composable-image.md#stack) | [PHP extensions](/languages/php/extensions.md) to enable. |
664664
| `disabled_extensions` | List of `string`s | [PHP extensions](/languages/php/extensions.md) to disable. |
665665
| `request_terminate_timeout` | `integer` | The timeout (in seconds) for serving a single request after which the PHP-FPM worker process is killed. |
666-
| `sizing_hints` | A [sizing hints definition](/create-apps/app-reference/composable-image.md#sizing-hints) | The assumptions for setting the number of workers in your PHP-FPM runtime. |
666+
| `sizing_hints` | A [sizing hints definition](#sizing-hints) | The assumptions for setting the number of workers in your PHP-FPM runtime. |
667667
| `xdebug` | An Xdebug definition | The setting to turn on [Xdebug](/languages/php/xdebug.md). |
668668

669+
### PHP-FPM service sizing hints {#sizing-hints}
670+
671+
The following table shows the properties that can be set in `sizing_hints`:
672+
673+
| Name | Type | Default | Minimum | Description |
674+
|-------------------|-----------|---------|---------|------------------------------------------------|
675+
| `request_memory` | `integer` | 45 | 10 | The average memory consumed per request in MB. |
676+
| `reserved_memory` | `integer` | 70 | 70 | The amount of memory reserved in MB. |
677+
678+
See more about [PHP-FPM workers and sizing](/languages/php/fpm.md).
679+
680+
### Example PHP configuration {#example-php-configuration}
681+
669682
Here is an example configuration:
670683

671684
```yaml {configFile="app"}

sites/upsun/src/create-apps/image-properties/crons.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ applications:
7878
7979
{{< /codetabs >}}
8080
81-
82-
In this example configuration, the [cron specification](https://en.wikipedia.org/wiki/Cron#Cron_expression) uses the `H` syntax.
81+
In this example configuration, the crons `spec` key uses the `H` syntax.
8382

8483
### Single-runtime image: Example cron jobs
8584

0 commit comments

Comments
 (0)