Skip to content

Commit 0f44e58

Browse files
authored
Merge pull request #5252 from platformsh/5251-comp-img-links
Single/Composable image restructure: Fix remaining broken links
2 parents 992bf0d + 9da7000 commit 0f44e58

File tree

20 files changed

+108
-59
lines changed

20 files changed

+108
-59
lines changed

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

Lines changed: 3 additions & 3 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,11 +62,11 @@ 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

6969
## Multi-app projects
70-
In a multiple application context, you can use a mix of single-runtime images and composable images. See the examples in the [single-runtime image](/create-apps/app-reference/single-runtime-image.md#combine-single-runtime-and-composable-images) topic and [composable](/create-apps/app-reference/composable-image.md#combine-single-runtime-and-composable-images) image topic.
70+
In a multiple application context, you can use a mix of single-runtime images and composable images. See the examples in the [single-runtime image](/create-apps/app-reference/single-runtime-image.md#combine-single-runtime-and-composable-images) topic and [composable image](/create-apps/app-reference/composable-image.md#combine-single-runtime-and-composable-images) topic.
7171

7272

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](/create-apps/app-reference/composable-image.md#php-as-a-primary-runtime) section in the Composable image 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#top-level-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/create-apps/troubleshoot-mounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can then put the mount back in place.
4242
## Mounted files not publicly accessible
4343

4444
If you've set up mounts to handle files like user uploads, you want to make sure the files are accessible.
45-
Do so by managing their [location](/create-apps/app-reference/single-runtime-image.md#locations).
45+
Do so by managing their [location](/create-apps/image-properties/web.md#locations).
4646
4747
This example defines two mounts, one named `private` and one `upload`:
4848

sites/platform/src/create-apps/web/static.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ web:
4141
See more information on the required minimal settings:
4242
- [Top-level properties](/create-apps/app-reference/single-runtime-image.md#top-level-properties).
4343
- [`web` property](/create-apps/image-properties/web.md).
44-
- [`locations` properties](/create-apps/app-reference/single-runtime-image.md#locations).
44+
- [`locations` properties](/create-apps/image-properties/web.md#locations).
4545

4646
## Add more features
4747

@@ -62,7 +62,7 @@ web:
6262
allow: true
6363
```
6464

65-
See more information on [`locations` properties](/create-apps/app-reference/single-runtime-image.md#locations).
65+
See more information on [`locations` properties](/create-apps/image-properties/web.md#locations).
6666

6767
### Create cache rules
6868

sites/platform/src/dedicated-environments/dedicated-gen-2/environment-differences.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The following settings require a [support ticket](/learn/overview/get-support.md
103103
* Increasing storage
104104
* Allocating storage among mounts and services
105105
* [PHP extensions](/languages/php/extensions.md)
106-
* Web server configuration (the [`web.locations` section of your app configuration](/create-apps/app-reference/single-runtime-image.md#locations))
106+
* Web server configuration (the [`web.locations` section of your app configuration](/create-apps/image-properties/web.md#locations))
107107

108108
## Logs
109109

sites/platform/src/define-routes/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ which is a requirement for the router caching.
485485
enabled: false
486486
```
487487

488-
2. [Disable request buffering](/create-apps/app-reference/single-runtime-image.md#locations) in your app configuration.
488+
2. [Disable request buffering](/create-apps/image-properties/web.md#locations) in your app configuration.
489489

490490
```yaml {configFile="app"}
491491
web:

0 commit comments

Comments
 (0)