Commit 21eeed07 authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'eread/port-rules-from-gitlab-runner-project' into 'master'

Port rules from gitlab-runner project

See merge request gitlab-org/gitlab!65939
parents 07a08c2d 31d12045
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
"Grafana", "Grafana",
"Gzip", "Gzip",
"Helm", "Helm",
"HipChat",
"ID", "ID",
"Ingress", "Ingress",
"jasmine-jquery", "jasmine-jquery",
...@@ -130,6 +131,7 @@ ...@@ -130,6 +131,7 @@
"Ubuntu", "Ubuntu",
"Ultra Auth", "Ultra Auth",
"Unicorn", "Unicorn",
"unicorn-worker-killer",
"URL", "URL",
"WebdriverIO", "WebdriverIO",
"YAML", "YAML",
......
...@@ -102,6 +102,7 @@ exceptions: ...@@ -102,6 +102,7 @@ exceptions:
- NFS - NFS
- NGINX - NGINX
- NOTE - NOTE
- NPM
- NTP - NTP
- ONLY - ONLY
- OSS - OSS
......
...@@ -247,6 +247,7 @@ Helm ...@@ -247,6 +247,7 @@ Helm
Heroku Heroku
Herokuish Herokuish
Hexo Hexo
HipChat
hostname hostname
hostnames hostnames
hotfix hotfix
...@@ -295,6 +296,7 @@ keytab ...@@ -295,6 +296,7 @@ keytab
keytabs keytabs
Kibana Kibana
Kinesis Kinesis
Klar
Knative Knative
Kramdown Kramdown
Kroki Kroki
......
...@@ -25,9 +25,9 @@ things manually. ...@@ -25,9 +25,9 @@ things manually.
As with every job, you need to create a valid `.gitlab-ci.yml` describing the As with every job, you need to create a valid `.gitlab-ci.yml` describing the
build environment. build environment.
Let's first specify the PHP image that is used for the job process Let's first specify the PHP image that is used for the job process.
(you can read more about what an image means in the runner's lingo reading (You can read more about what an image means in the runner's lingo reading
about [Using Docker images](../docker/using_docker_images.md#what-is-an-image)). about [Using Docker images](../docker/using_docker_images.md#what-is-an-image).)
Start by adding the image to your `.gitlab-ci.yml`: Start by adding the image to your `.gitlab-ci.yml`:
......
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