Skip to content

Pre-GA fixes #3917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vale.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ StylesPath = contributing/styles

Vocab = Platform

MinAlertLevel = suggestion # suggestion, warning, or error
MinAlertLevel = error # suggestion, warning, or error

[*.md]
BasedOnStyles = Platform,Vale
Expand Down
2 changes: 2 additions & 0 deletions contributing/styles/config/vocabularies/Platform/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CDNs?
CMS
CNAMEs?
[Cc]onfig
[Cc]omposable
Corepack
CPUs?
[Cc]ron
Expand Down Expand Up @@ -101,6 +102,7 @@ Nagios
Namecheap
namespace
Neve
Nixpkgs
[Nn]ginx
NodePing
Nori
Expand Down
2 changes: 1 addition & 1 deletion sites/platform/src/create-apps/app-reference/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{{% vendor/name %}} guarantees optimal user experience with the specific [set of packages](/create-apps/app-reference/composable-image.md#supported-nix-packages) it supports.
You can use any other package available from the [Nix Packages collection](https://search.nixos.org/), including unstable ones,
but NixOs is reponsible for their support.
but NixOs is responsible for their support.

Check failure on line 28 in sites/platform/src/create-apps/app-reference/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/create-apps/app-reference/_index.md#L28

[Vale.Spelling] Did you really mean 'reponsible'?
Raw output
{"message": "[Vale.Spelling] Did you really mean 'reponsible'?", "location": {"path": "sites/platform/src/create-apps/app-reference/_index.md", "range": {"start": {"line": 28, "column": 14}}}, "severity": "ERROR"}

{{% /note %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

- You can add as many packages to your application container as you need,
choosing from over 80,000 packages from [the Nixpkgs collection](https://search.nixos.org/packages).
- The packages you add are built in total isolation, so you can easily install different versions of the same package.
- The packages you add are built in total isolation, so you can install different versions of the same package.

Check failure on line 20 in sites/platform/src/create-apps/app-reference/composable-image.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/create-apps/app-reference/composable-image.md#L20

[Platform.condescending] Using 'easily' may come across as condescending.
Raw output
{"message": "[Platform.condescending] Using 'easily' may come across as condescending.", "location": {"path": "sites/platform/src/create-apps/app-reference/composable-image.md", "range": {"start": {"line": 20, "column": 65}}}, "severity": "ERROR"}
- With [Nix](https://nix.dev/reference/glossary#term-Nix), there are no undeclared dependencies in your source code.
What works on your local machine is guaranteed to work on any other machine.

Expand All @@ -42,7 +42,7 @@
| Name | Type | Required | Set in instance? | Description |
|--------------------|-----------------------------------------------------|----------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `name` | `string` | Yes | No | A unique name for the app. Must be lowercase alphanumeric characters. Changing the name destroys data associated with the app. |
| `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). |
| `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). |
| `size` | A [size](#sizes) | | Yes | How much resources to devote to the app. Defaults to `AUTO` in production environments. |
| `relationships` | A dictionary of [relationships](#relationships) | | Yes | Connections to other services and apps. |
| `disk` | `integer` or `null` | | Yes | The size of the disk space for the app in [MB](/glossary.md#mb). Minimum value is `128`. Defaults to `null`, meaning no disk is available. See [note on available space](#available-disk-space) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
## Types

{{% note theme="info" %}}
You can now use the Upsun composable image (BETA) to install runtimes and tools in your application container.
You can now use the {{% vendor/name %}} composable image (BETA) to install runtimes and tools in your application container.

Check failure on line 60 in sites/platform/src/create-apps/app-reference/single-runtime-image.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/create-apps/app-reference/single-runtime-image.md#L60

[Vale.Spelling] Did you really mean 'Upsun'?
Raw output
{"message": "[Vale.Spelling] Did you really mean 'Upsun'?", "location": {"path": "sites/platform/src/create-apps/app-reference/single-runtime-image.md", "range": {"start": {"line": 60, "column": 21}}}, "severity": "ERROR"}

Check failure on line 60 in sites/platform/src/create-apps/app-reference/single-runtime-image.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/create-apps/app-reference/single-runtime-image.md#L60

[Vale.Spelling] Did you really mean 'composable'?
Raw output
{"message": "[Vale.Spelling] Did you really mean 'composable'?", "location": {"path": "sites/platform/src/create-apps/app-reference/single-runtime-image.md", "range": {"start": {"line": 60, "column": 27}}}, "severity": "ERROR"}
If you've reached this section from another page, you may be interested in supported `stacks` where `type` was referenced.
See [supported Nix packages for the `stack` key](/create-apps/app-reference/composable-image#supported-nix-packages) for more information.
{{% /note %}}
Expand Down Expand Up @@ -133,7 +133,7 @@
New syntax (default and explicit endpoints) described below is supported by most, but not all, image types
(`Relationship 'SERVICE_NAME' of application 'app' ... targets a service without a valid default endpoint configuration.`).
This syntax is currently being rolled out for all images.
If you encounter this error, use the "legacy" Platform.sh configuration noted at the bottom of this section.
If you encounter this error, use the "legacy" {{% vendor/name %}} configuration noted at the bottom of this section.

{{< /note >}}

Expand Down Expand Up @@ -1079,7 +1079,7 @@
### Extensions

{{% note theme="info" %}}
You can now use the Upsun composable image (BETA) to install runtimes and tools in your application container.
You can now use the {{% vendor/name %}} composable image (BETA) to install runtimes and tools in your application container.
If you've reached this section from another page and are using the composable image, enabling/disabling extensions should be placed under the `stack` key instead of what is listed below.
See [how to configure extensions with the composable image](/create-apps/app-reference/composable-image#top-level-properties).
{{% /note %}}
Expand Down
2 changes: 1 addition & 1 deletion sites/platform/src/create-apps/hooks/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Because these steps should be done before the site accepts request, they should
All of this configuration and preparation can be handled in a bash script.

<!-- @todo: this context is not so simple to disentangle, so leaving for now -->
1. Copy the [preparation script from the Platform.sh template](https://github.com/platformsh-templates/nextjs-drupal/blob/master/api/platformsh-scripts/hooks.deploy.sh)
1. Copy the [preparation script from the {{% vendor/name %}} template](https://github.com/platformsh-templates/nextjs-drupal/blob/master/api/platformsh-scripts/hooks.deploy.sh)
into a file called `hooks.deploy.sh` in a `api/platformsh-scripts` directory.
Note that hooks are executed using the dash shell, not the bash shell used by SSH logins.
2. Copy the [Drush configuration script from the template](https://github.com/platformsh-templates/nextjs-drupal/blob/master/api/drush/platformsh_generate_drush_yml.php)
Expand Down
4 changes: 2 additions & 2 deletions sites/platform/src/languages/php/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{{% note theme="info" %}}

You can now use the Upsun composable image (BETA) to install runtimes and tools in your application container.
You can now use the {{% vendor/name %}} composable image (BETA) to install runtimes and tools in your application container.

Check failure on line 9 in sites/platform/src/languages/php/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/languages/php/_index.md#L9

[Vale.Spelling] Did you really mean 'Upsun'?
Raw output
{"message": "[Vale.Spelling] Did you really mean 'Upsun'?", "location": {"path": "sites/platform/src/languages/php/_index.md", "range": {"start": {"line": 9, "column": 21}}}, "severity": "ERROR"}

Check failure on line 9 in sites/platform/src/languages/php/_index.md

View workflow job for this annotation

GitHub Actions / vale

[vale] sites/platform/src/languages/php/_index.md#L9

[Vale.Spelling] Did you really mean 'composable'?
Raw output
{"message": "[Vale.Spelling] Did you really mean 'composable'?", "location": {"path": "sites/platform/src/languages/php/_index.md", "range": {"start": {"line": 9, "column": 27}}}, "severity": "ERROR"}
To find out more about this feature, see the [dedicated documentation page](/create-apps/app-reference/composable-image.md).</br>
Also, see how you can [modify your PHP runtime when using a composable image](#modify-your-php-runtime-when-using-a-composable-image).

Expand Down Expand Up @@ -611,7 +611,7 @@

{{% note theme= "warning" %}}

This section is only relevant when using the Upsun [composable image (BETA)](/create-apps/app-reference/composable-image.md).
This section is only relevant when using the {{% vendor/name %}} [composable image (BETA)](/create-apps/app-reference/composable-image.md).

{{% /note %}}

Expand Down
2 changes: 1 addition & 1 deletion sites/upsun/src/administration/billing/monitor-billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ keywords:
---

To help you manage costs related to your organization,
Upsun provides estimates for the current month and the next.
{{% vendor/name %}} provides estimates for the current month and the next.

You can set billing alerts to ensure you don't overspend,
and track resource usage on each of your projects.
Expand Down
2 changes: 1 addition & 1 deletion sites/upsun/src/create-apps/app-reference/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ You can add as many packages to your application container as you need.

{{% vendor/name %}} guarantees optimal user experience with the specific [set of packages](/create-apps/app-reference/composable-image.md#supported-nix-packages) it supports.
You can use any other package available from the [Nix Packages collection](https://search.nixos.org/), including unstable ones,
but NixOs is reponsible for their support.
but NixOs is responsible for their support.

{{% /note %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The composable image is built on [Nix](https://nix.dev), which offers the follow

- You can add as many packages to your application container as you need,
choosing from over 80,000 packages from [the Nixpkgs collection](https://search.nixos.org/packages).
- The packages you add are built in total isolation, so you can easily install different versions of the same package.
- The packages you add are built in total isolation, so you can install different versions of the same package.
- With [Nix](https://nix.dev/reference/glossary#term-Nix), there are no undeclared dependencies in your source code.
What works on your local machine is guaranteed to work on any other machine.

Expand Down
Loading
Loading