Skip to content

G
gitlab-ce
Commit eeb6ce4c authored by Evan Read's avatar Evan Read
Browse files
Options

Merge branch 'selhorn-runner-5' into 'master' 

Docs: Addressed other instances of runner

Closes #239201 and #239211

See merge request gitlab-org/gitlab!40161
parents 4771e7b9 8efb6816
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
doc/ci/docker/using_docker_images.md
View file @ eeb6ce4c
...@@ -477,7 +477,7 @@ inside it and you would like to use it as a base image for your job because you ...@@ -477,7 +477,7 @@ inside it and you would like to use it as a base image for your job because you
want to execute some tests with this database binary. Let's also assume that want to execute some tests with this database binary. Let's also assume that
this image is configured with `/usr/bin/super-sql run` as an entrypoint. That this image is configured with `/usr/bin/super-sql run` as an entrypoint. That
means that when starting the container without additional options, it runs means that when starting the container without additional options, it runs
the database's process, while runner expects that the image has no the database's process, while the runner expects that the image has no
entrypoint or that the entrypoint is prepared to start a shell command. entrypoint or that the entrypoint is prepared to start a shell command.
With the extended Docker configuration options, instead of creating your With the extended Docker configuration options, instead of creating your
......
doc/ci/variables/predefined_variables.md
View file @ eeb6ce4c
...@@ -119,7 +119,7 @@ Kubernetes-specific environment variables are detailed in the ...@@ -119,7 +119,7 @@ Kubernetes-specific environment variables are detailed in the
| `CI_RUNNER_EXECUTABLE_ARCH` | all | 10.6 | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor) | | `CI_RUNNER_EXECUTABLE_ARCH` | all | 10.6 | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor) |
| `CI_RUNNER_ID` | 8.10 | 0.5 | The unique ID of runner being used | | `CI_RUNNER_ID` | 8.10 | 0.5 | The unique ID of runner being used |
| `CI_RUNNER_REVISION` | all | 10.6 | GitLab Runner revision that is executing the current job | | `CI_RUNNER_REVISION` | all | 10.6 | GitLab Runner revision that is executing the current job |
| `CI_RUNNER_SHORT_TOKEN` | all | 12.3 | First eight characters of GitLab Runner's token used to authenticate new job requests. Used as runner's unique ID | | `CI_RUNNER_SHORT_TOKEN` | all | 12.3 | First eight characters of the runner's token used to authenticate new job requests. Used as runner's unique ID |
| `CI_RUNNER_TAGS` | 8.10 | 0.5 | The defined runner tags | | `CI_RUNNER_TAGS` | 8.10 | 0.5 | The defined runner tags |
| `CI_RUNNER_VERSION` | all | 10.6 | GitLab Runner version that is executing the current job | | `CI_RUNNER_VERSION` | all | 10.6 | GitLab Runner version that is executing the current job |
| `CI_SERVER` | all | all | Mark that job is executed in CI environment | | `CI_SERVER` | all | all | Mark that job is executed in CI environment |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7