diff options
| author | danielgruesso <dgruesso@gitlab.com> | 2018-12-21 11:06:11 -0500 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-21 21:10:46 +0100 |
| commit | c5b59a1678bc7ee625cad36a022c2cc0032074ea (patch) | |
| tree | cc1d2f149664402145782c32f25e0d49b61982ec | |
| parent | 53dba6e34f1060b215acd7895f96676febbe545c (diff) | |
| download | gitlab-ce-c5b59a1678bc7ee625cad36a022c2cc0032074ea.tar.gz | |
Update registry section. Update serverless.yaml formatting
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 7521df6c746..dcf55424970 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -84,8 +84,6 @@ At launch, the following [runtimes](https://gitlab.com/triggermesh/runtimes) are - node.js - kaniko -You can locate the runtimes souce at https://gitlab.com/triggermesh/runtimes - In order to deploy functions to your Knative instance, the following files must be present: 1. `gitlab-ci.yml`: This template allows to define the stage, environment, and @@ -124,15 +122,16 @@ In order to deploy functions to your Knative instance, the following files must functions: echo: - handler: echo - runtime: https://gitlab.com/triggermesh/runtimes/raw/master/nodejs.yaml - description: "echo function using node.js runtime" - buildargs: - - DIRECTORY=echo + handler: echo + runtime: https://gitlab.com/triggermesh/runtimes/raw/master/nodejs.yaml + description: "echo function using node.js runtime" + buildargs: + - DIRECTORY=echo environment: FUNCTION: echo ``` + The `serverless.yaml` file contains three sections with distinct parameters: ### `service` @@ -148,7 +147,7 @@ The `serverless.yaml` file contains three sections with distinct parameters: | Parameter | Description | |-----------|-------------| | `name` | Indicates which provider is used to execute the `serverless.yaml` file. In this case, the TriggerMesh `tm` CLI. | -| `registry-secret` | Indicates which registry will be used to store docker images. The sample function is using the `GitLab registry`, however, you can use other popular registries such as `Docker Hub`, `Google Container Registry`, or `Amazon EC2 Container Registry`. | +| `registry-secret` | Indicates which registry will be used to store docker images. The sample function is using the GitLab Registry (`gitlab-registry`). A different registry host may be specified using `registry` key in the `provider` object. If changing the default, update the permission on the `gitlab-ci.yml` file. | | `environment` | Includes the environment variables to be passed as part of function execution for **all** functions in the file, where `FOO` is the variable name and `BAR` are he variable contents. You may replace this with you own variables. | ### `functions` |