Skip to content

Commit 2db2b34

Browse files
Kemi-Elizabethfabpot
Kemi-Elizabeth
authored and
fabpot
committed
feat: adjusted table and removed note
simplified table description and removed warning about new nix channels
1 parent 19c4a4c commit 2db2b34

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

‎sites/platform/src/create-apps/app-reference/composable-image.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ To override any part of a property, you have to provide the entire property.
4040
| Name | Type | Required | Set in instance? | Description |
4141
|--------------------|--------------------------------------------------------------------------|----------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
4242
| `name` | `string` | Yes | No | A unique name for the app. Must be lowercase alphanumeric characters. Changing the name destroys data associated with the app. |
43+
| `type` | A type | Yes | No | [Defines the version of the Nix channel](#supported-nix-channels). Example: `type: "composable:25.05"` |
4344
| `stack` | An array of [Nix packages](#stack) | Yes | No | A list of packages from the {{% vendor/name %}} collection of [supported runtimes](#supported-nix-packages) and/or from [Nixpkgs](https://search.nixos.org/packages). |
4445
| `size` | A [size](#sizes) | | Yes | How much resources to devote to the app. Defaults to `AUTO` in production environments. |
4546
| `relationships` | A dictionary of [relationships](#relationships) | | Yes | Connections to other services and apps. |
@@ -56,7 +57,6 @@ To override any part of a property, you have to provide the entire property.
5657
| `source` | A [source dictionary](#source) | | No | Information on the app's source code and operations that can be run on it. |
5758
| `additional_hosts` | An [additional hosts dictionary](#additional-hosts) | | Yes | Maps of hostnames to IP addresses. |
5859
| `operations` | A [dictionary of Runtime operations](/create-apps/runtime-operations.md) | | No | Runtime operations for the application. |
59-
| `type` | A type | Yes | No | The base image to use with a specific app language. Format: `composable:version`. When using `type` with composable image, the type must be composable. You can also [define the version of the Nix channel](#supported-nix-channels) with `type`. |
6060

6161
{{% note %}}
6262
The ``build``, ``dependencies``, and ``runtime`` keys are only supported when using a [single-runtime image](/create-apps/app-reference/single-runtime-image.md).
@@ -110,12 +110,6 @@ If you use PHP, note that PHP-FPM is only started automatically if PHP is define
110110
- `24.05`
111111
- `25.05`
112112

113-
{{% note theme=warning title="Warning" %}}
114-
115-
Note that any new channels released by Nix will **not be immediately available**.
116-
117-
{{% /note %}}
118-
119113
### Configure Nix channels
120114

121115
The Nix channel can be configured with the [top-level property `type`](#top-level-properties).

‎sites/upsun/src/create-apps/app-reference/composable-image.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ To override any part of a property, you have to provide the entire property.
6060

6161
| Name | Type | Required | Set in instance? | Description |
6262
|----------------------|------------------------------------------------------------------------------------------|----------|------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
63+
| `type` | A type | Yes | No | [Defines the version of the Nix channel](#supported-nix-channels). Example: `type: "composable:25.05"` |
6364
| `stack` | An array of [Nix packages](#stack) | Yes | No | A list of packages from the {{% vendor/name %}} collection of [supported runtimes](#supported-nix-packages) and/or from [NixPkgs](https://search.nixos.org/packages). |
6465
| `container_profile` | A [container profile](/manage-resources/adjust-resources.md#advanced-container-profiles) | | Yes | Container profile of the application. |
6566
| `relationships` | A dictionary of [relationships](#relationships) | | Yes | Connections to other services and apps. |
@@ -75,7 +76,7 @@ To override any part of a property, you have to provide the entire property.
7576
| `source` | A [source dictionary](#source) | | No | Information on the app's source code and operations that can be run on it. |
7677
| `additional_hosts` | An [additional hosts dictionary](#additional-hosts) | | Yes | Maps of hostnames to IP addresses. |
7778
| `operations` | A [dictionary of Runtime operations](/create-apps/runtime-operations.md) | | No | Runtime operations for the application. |
78-
| `type` | A type | Yes | No | The base image to use with a specific app language. Format: `composable:version`. When using `type` with composable image, the type must be composable. You can also [define the version of the Nix channel](#supported-nix-channels) with `type`. |
79+
7980

8081
{{% note %}}
8182
The ``build``, ``dependencies``, and ``runtime`` keys are only supported when using a [single-runtime image](/create-apps/app-reference/single-runtime-image.md).
@@ -130,12 +131,6 @@ If you use PHP, note that PHP-FPM is only started automatically if PHP is define
130131
- `24.05`
131132
- `25.05`
132133

133-
{{% note theme=warning title="Warning" %}}
134-
135-
Note that any new channels released by Nix will **not be immediately available**.
136-
137-
{{% /note %}}
138-
139134
### Configure Nix channels
140135

141136
The Nix channel can be configured with the [top-level property `type`](#primary-application-properties).

0 commit comments

Comments
 (0)