diff options
| author | Evan Read <eread@gitlab.com> | 2018-12-21 03:59:55 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2018-12-21 03:59:55 +0000 |
| commit | 5a3bff5d83d14aeaa590304d6b13d1a8320645c1 (patch) | |
| tree | dc1a76a5011b2566401307ad461802a4117fabcc | |
| parent | 62d250ff666770f9807eec2199a7b208ea8b518a (diff) | |
| parent | bae88d8887fbf49a680c72d75000244a3cdf70ab (diff) | |
| download | gitlab-ce-5a3bff5d83d14aeaa590304d6b13d1a8320645c1.tar.gz | |
Merge branch '55621-gitlab-ci-yml-on-serverless-docs' into 'master'
Fix typos about .gitlab-ci.yml in Serverless docs
See merge request gitlab-org/gitlab-ce!23963
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index c1f2e844362..a1e5735670a 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -31,7 +31,7 @@ To run Knative on Gitlab, you will need: external IP address for all the applications served by Knative. You will be prompted to enter a wildcard domain where your applications will be served. Configure your DNS server to use the external IP address for that domain. -1. **`gitlab-ci.yml`:** GitLab uses [Kaniko](https://github.com/GoogleContainerTools/kaniko) +1. **`.gitlab-ci.yml`:** GitLab uses [Kaniko](https://github.com/GoogleContainerTools/kaniko) to build the application and the [TriggerMesh CLI](https://github.com/triggermesh/tm) to simplify the deployment of knative services and functions. 1. **`serverless.yml`** (for [functions only](#deploying-functions)): When using serverless to deploy functions, the `serverless.yml` file @@ -81,7 +81,7 @@ you to focus on a single task that can be executed/scaled automatically and inde In order to deploy functions to your Knative instance, the following templates must be present: -1. `gitlab-ci.yml`: This template allows to define the stage, environment, and +1. `.gitlab-ci.yml`: This template allows to define the stage, environment, and image to be used for your functions. It must be included at the root of your repository: ```yaml |