diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 06:06:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 06:06:45 +0300 |
| commit | 56d78c702884b2f555e7e4f61da4647519872771 (patch) | |
| tree | edf00e0bbeb4203348502e68664e9fb157e1741e /doc | |
| parent | fd0691c6c0dc16ddada016af08c47a28614e888d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/kubernetes.md | 7 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md index 82aa02ac75d..9c04b8bb21a 100644 --- a/doc/development/kubernetes.md +++ b/doc/development/kubernetes.md @@ -123,3 +123,10 @@ they are written: ```bash kubectl logs <pod_name> --follow -n gitlab-managed-apps ``` + +## GitLab Managed Apps + +GitLab provides [GitLab Managed Apps](../user/clusters/applications.html), a one-click install for various applications which can be added directly to your configured cluster. + +**<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> +For an overview of how to add a new GitLab-mananged app, see [How to add GitLab-managed-apps to Kubernetes integration](https://youtu.be/mKm-jkranEk).** diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 27d6cc9b47b..83bcb7950b5 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -725,6 +725,8 @@ or a `.buildpacks` file in your project: CAUTION: **Caution:** Using multiple buildpacks isn't yet supported by Auto DevOps. +CAUTION: **Caution:** When using the `.buildpacks` file, Auto Test will not work. The buildpack [heroku-buildpack-multi](https://github.com/heroku/heroku-buildpack-multi/) (which is used under the hood to parse the `.buildpacks` file) doesn't provide the necessary commands `bin/test-compile` and `bin/test`. Make sure to provide the project variable `BUILDPACK_URL` instead. + ### Custom `Dockerfile` If your project has a `Dockerfile` in the root of the project repo, Auto DevOps |