summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-12-10 11:05:03 +1300
committerThong Kuah <tkuah@gitlab.com>2018-12-10 11:05:03 +1300
commit1a8dbce28f89d776ad0def83ebeaae80e04217f8 (patch)
treeae959f998afc72e4a5f6095898673778fdbd6694
parent7cb0dd98590e8fdd7483b9f61643a0daa23c2b67 (diff)
downloadgitlab-ce-55089-fix-gitlab-ci-serverless-docs.tar.gz
Fix bad indentation in .gitlab-ci.yml example55089-fix-gitlab-ci-serverless-docs
Otherwise users will try out Serverless with this bad example and get "Invalid .gitlab-ci.yml file" errors
-rw-r--r--doc/user/project/clusters/serverless/index.md24
1 files changed, 10 insertions, 14 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md
index bdbc4f7f09d..7fe33d37da0 100644
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -36,27 +36,23 @@ To run Knative on Gitlab, you will need:
```yaml
stages:
- - build
- - deploy
+ - build
+ - deploy
build:
- stage: build
- image:
+ stage: build
+ image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
- only:
- - master
- script:
+ script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE
deploy:
- stage: deploy
- image: gcr.io/triggermesh/tm@sha256:e3ee74db94d215bd297738d93577481f3e4db38013326c90d57f873df7ab41d5
- only:
- - master
- environment: production
- script:
+ stage: deploy
+ image: gcr.io/triggermesh/tm@sha256:e3ee74db94d215bd297738d93577481f3e4db38013326c90d57f873df7ab41d5
+ environment: production
+ script:
- echo "$CI_REGISTRY_IMAGE"
- tm -n "$KUBE_NAMESPACE" --config "$KUBECONFIG" deploy service "$CI_PROJECT_NAME" --from-image "$CI_REGISTRY_IMAGE" --wait
```
@@ -134,4 +130,4 @@ Job succeeded
The second to last line, labeled **Service domain** contains the URL for the deployment. Copy and paste the domain into your
browser to see the app live.
-![knative app](img/knative-app.png) \ No newline at end of file
+![knative app](img/knative-app.png)