Skip to content

Commit 9da7000

Browse files
committed
Sort out multi-app info and links
1 parent c5cf728 commit 9da7000

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ Only the single-runtime image supports the [``build``](/create-apps/app-referenc
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ you can use a mix of single-runtime images and [composable images](/create-apps/
222222
The following sample configuration includes two applications:
223223
- ``frontend`` – uses a single-runtime image
224224
- ``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.
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.
226226

227227

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

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](/create-apps/app-reference/composable-image.md#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/upsun/src/create-apps/app-reference/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Only the single-runtime image supports the [``build``](/create-apps/app-referenc
6565
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.
6666

6767
## Multi-app projects
68-
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.
68+
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.
6969

7070

7171

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

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -109,38 +109,6 @@ applications:
109109
type: 'php:{{% latest "php" %}}'
110110
```
111111

112-
### Combine single-runtime and composable images {#combine-single-runtime-and-composable-images}
113-
114-
In a [multiple application context](/create-apps/multi-app/_index.md),
115-
you can use a mix of single-runtime images
116-
and [composable images](/create-apps/app-reference/composable-image.md).
117-
118-
119-
The following sample configuration includes two applications:
120-
- ``frontend`` – uses a single-runtime image
121-
- ``backend`` – uses a composable image<br>
122-
123-
```yaml {configFile="app"}
124-
applications:
125-
frontend:
126-
# this app uses the single-runtime image with a specific node.js runtime
127-
type: 'nodejs:{{% latest "nodejs" %}}'
128-
backend:
129-
# this app uses the composable image and specifies two runtimes
130-
type: "composable:{{% latest composable %}}"
131-
stack:
132-
runtimes:
133-
134-
extensions:
135-
- apcu
136-
- sodium
137-
- xsl
138-
- pdo_sqlite
139-
140-
packages:
141-
- "python313Packages.yq" # python package specific
142-
```
143-
144112
## `build` {#build}
145113

146114
The only property of the `build` dictionary is `flavor`, which specifies a default set of build tasks to run.
@@ -292,3 +260,36 @@ Related topics:
292260
You can reduce the target disk size of an app. Keep in mind:
293261
- Backups created before the downsize are incompatible and cannot be used; you must [create new backups](/environments/backup.md).
294262
- The downsize will fail if the disk contains more data than the target size.
263+
264+
### Combine single-runtime and composable images {#combine-single-runtime-and-composable-images}
265+
266+
In a [multiple application context](/create-apps/multi-app/_index.md),
267+
you can use a mix of single-runtime images
268+
and [composable images](/create-apps/app-reference/composable-image.md).
269+
270+
271+
The following sample configuration includes two applications:
272+
- ``frontend`` – uses a single-runtime image
273+
- ``backend`` – uses a composable image<br>
274+
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.
275+
276+
```yaml {configFile="app"}
277+
applications:
278+
frontend:
279+
# this app uses the single-runtime image with a specific node.js runtime
280+
type: 'nodejs:{{% latest "nodejs" %}}'
281+
backend:
282+
# this app uses the composable image and specifies two runtimes
283+
type: "composable:{{% latest composable %}}"
284+
stack:
285+
runtimes:
286+
287+
extensions:
288+
- apcu
289+
- sodium
290+
- xsl
291+
- pdo_sqlite
292+
293+
packages:
294+
- "python313Packages.yq" # python package specific
295+
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ title=Single-runtime image
2525

2626
The keys of the `workers` definition are the names of the workers.
2727
You can then define how each worker differs from the `web` instance using
28-
the [top-level properties](/create-apps/app-reference/single-runtime-image.md#primary-application-properties).
28+
the [primary application properties](/create-apps/app-reference/single-runtime-image.md#primary-application-properties).
2929

3030
Each worker can differ from the `web` instance in all properties _except_ for:
3131

@@ -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](/create-apps/app-reference/composable-image.md#primary-application-properties).
60+
the [primary application 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

0 commit comments

Comments
 (0)