Skip to content

Commit b4cba27

Browse files
tylers-usernametylers-username
authored
Merge branch 'main' into feature--engagement-tagging
2 parents dfe8e67 + d73765f commit b4cba27

File tree

10 files changed

+136
-114
lines changed

10 files changed

+136
-114
lines changed

‎shared/data/registry.json

+2
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@
942942
"2.7*"
943943
],
944944
"supported": [
945+
"3.13",
945946
"3.12",
946947
"3.11",
947948
"3.10",
@@ -1120,6 +1121,7 @@
11201121
"2.3"
11211122
],
11221123
"supported": [
1124+
"3.4",
11231125
"3.3",
11241126
"3.2",
11251127
"3.1",

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

+22-20
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,26 @@ The following table presents all the properties you can use at the top level of
3737
The column _Set in instance?_ defines whether the given property can be overridden within a `web` or `workers` instance.
3838
To override any part of a property, you have to provide the entire property.
3939

40-
| Name | Type | Required | Set in instance? | Description |
41-
|--------------------|-----------------------------------------------------|----------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
42-
| `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-
| `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). |
44-
| `size` | A [size](#sizes) | | Yes | How much resources to devote to the app. Defaults to `AUTO` in production environments. |
45-
| `relationships` | A dictionary of [relationships](#relationships) | | Yes | Connections to other services and apps. |
46-
| `disk` | `integer` or `null` | | Yes | The size of the disk space for the app in [MB](/glossary/_index.md#mb). Minimum value is `128`. Defaults to `null`, meaning no disk is available. See [note on available space](#available-disk-space) |
47-
| `mounts` | A dictionary of [mounts](#mounts) | | Yes | Directories that are writable even after the app is built. If set as a local source, `disk` is required. |
48-
| `web` | A [web instance](#web) | | N/A | How the web application is served. |
49-
| `workers` | A [worker instance](#workers) | | N/A | Alternate copies of the application to run as background processes. |
50-
| `timezone` | `string` | | No | The timezone for crons to run. Format: a [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). Defaults to `UTC`, which is the timezone used for all logs no matter the value here. See also [app runtime timezones](/create-apps/timezone.md) |
51-
| `access` | An [access dictionary](#access) | | Yes | Access control for roles accessing app environments. |
52-
| `variables` | A [variables dictionary](#variables) | | Yes | Variables to control the environment. |
53-
| `firewall` | A [firewall dictionary](#firewall) | | Yes | Outbound firewall rules for the application. |
54-
| `hooks` | A [hooks dictionary](#hooks) | | No | What commands run at different stages in the build and deploy process. |
55-
| `crons` | A [cron dictionary](#crons) | | No | Scheduled tasks for the app. |
56-
| `source` | A [source dictionary](#source) | | No | Information on the app's source code and operations that can be run on it. |
57-
| `additional_hosts` | An [additional hosts dictionary](#additional-hosts) | | Yes | Maps of hostnames to IP addresses. |
40+
| Name | Type | Required | Set in instance? | Description |
41+
|--------------------|--------------------------------------------------------------------------|----------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
42+
| `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+
| `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). |
44+
| `size` | A [size](#sizes) | | Yes | How much resources to devote to the app. Defaults to `AUTO` in production environments. |
45+
| `relationships` | A dictionary of [relationships](#relationships) | | Yes | Connections to other services and apps. |
46+
| `disk` | `integer` or `null` | | Yes | The size of the disk space for the app in [MB](/glossary/_index.md#mb). Minimum value is `128`. Defaults to `null`, meaning no disk is available. See [note on available space](#available-disk-space) |
47+
| `mounts` | A dictionary of [mounts](#mounts) | | Yes | Directories that are writable even after the app is built. If set as a local source, `disk` is required. |
48+
| `web` | A [web instance](#web) | | N/A | How the web application is served. |
49+
| `workers` | A [worker instance](#workers) | | N/A | Alternate copies of the application to run as background processes. |
50+
| `timezone` | `string` | | No | The timezone for crons to run. Format: a [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). Defaults to `UTC`, which is the timezone used for all logs no matter the value here. See also [app runtime timezones](/create-apps/timezone.md) |
51+
| `access` | An [access dictionary](#access) | | Yes | Access control for roles accessing app environments. |
52+
| `variables` | A [variables dictionary](#variables) | | Yes | Variables to control the environment. |
53+
| `firewall` | A [firewall dictionary](#firewall) | | Yes | Outbound firewall rules for the application. |
54+
| `hooks` | A [hooks dictionary](#hooks) | | No | What commands run at different stages in the build and deploy process. |
55+
| `crons` | A [cron dictionary](#crons) | | No | Scheduled tasks for the app. |
56+
| `source` | A [source dictionary](#source) | | No | Information on the app's source code and operations that can be run on it. |
57+
| `additional_hosts` | An [additional hosts dictionary](#additional-hosts) | | Yes | Maps of hostnames to IP addresses. |
58+
| `operations` | A [dictionary of Runtime operations](/create-apps/runtime-operations.md) | | No | Runtime operations for the application. |
59+
5860
{{% note %}}
5961
The ``type``, ``build``, ``dependencies``, and ``runtime`` keys are only supported when using a [single-runtime image](/create-apps/app-reference/single-runtime-image.md).
6062
They are **not** supported when using the composable image.
@@ -827,8 +829,8 @@ The key of each item is a regular expression to match paths exactly.
827829
If an incoming request matches the rule, it's handled by the properties under the rule,
828830
overriding any conflicting rules from the rest of the `locations` dictionary.
829831

830-
Under `rules`, you can set all of the other possible [`locations` properties](#locations)
831-
except `root`, `index` and `request_buffering`.
832+
Under `rules`, you can set all the other possible [`locations` properties](#locations)
833+
except `root`, `index`, `rules` and `request_buffering`.
832834

833835
In the following example, the `allow` key disallows requests for static files anywhere in the site.
834836
This is overridden by a rule that explicitly allows common image file formats.

0 commit comments

Comments
 (0)