diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:09:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:09:07 +0000 |
| commit | 6b8d671de726534a03c18e025a586e1bc9c04a4f (patch) | |
| tree | f6a9168160b0d435641a1767b2e68487ec75ae46 /doc/administration | |
| parent | 163a7046ac76eb4109184e82ce0af911633e6626 (diff) | |
| download | gitlab-ce-6b8d671de726534a03c18e025a586e1bc9c04a4f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/packages/container_registry.md | 6 | ||||
| -rw-r--r-- | doc/administration/server_hooks.md | 5 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/kubernetes_cheat_sheet.md | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index 87be9d500fb..26c83ab6034 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -619,7 +619,7 @@ provided by `gitlab-ctl`. Consider the following example, where you first build the image: -```bash +```shell # This builds a image with content of sha256:111111 docker build -t my.registry.com/my.group/my.project:latest . docker push my.registry.com/my.group/my.project:latest @@ -627,7 +627,7 @@ docker push my.registry.com/my.group/my.project:latest Now, you do overwrite `:latest` with a new version: -```bash +```shell # This builds a image with content of sha256:222222 docker build -t my.registry.com/my.group/my.project:latest . docker push my.registry.com/my.group/my.project:latest @@ -774,7 +774,7 @@ once a week. Create a file under `/etc/cron.d/registry-garbage-collect`: -```bash +```shell SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md index 4c72634d4ff..37fffcdce22 100644 --- a/doc/administration/server_hooks.md +++ b/doc/administration/server_hooks.md @@ -88,11 +88,10 @@ pattern (`*~`). The hooks are searched and executed in this order: -1. `gitlab-shell/hooks` directory as known to Gitaly. -1. `<project>.git/hooks/<hook_name>` - executed by `git` itself, this is symlinked to `gitlab-shell/hooks/<hook_name>`. +1. Built-in GitLab server hooks (not user-customizable). 1. `<project>.git/custom_hooks/<hook_name>` - per-project hook (this was kept as the already existing behavior). 1. `<project>.git/custom_hooks/<hook_name>.d/*` - per-project hooks. -1. `<project>.git/hooks/<hook_name>.d/*` OR `<custom_hooks_dir>/<hook_name.d>/*` - global hooks: all executable files (except editor backup files). +1. `<custom_hooks_dir>/<hook_name>.d/*` - global hooks: all executable files (except editor backup files). The hooks of the same type are executed in order and execution stops on the first script exiting with a non-zero value. diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md index 48d415c6bdf..4ffce11aed0 100644 --- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md +++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md @@ -74,7 +74,7 @@ and they will assist you with any issues you are having. - How to get cronjobs configured on a cluster - ```bash + ```shell kubectl get cronjobs ``` |