BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
160f1fd2
Commit
160f1fd2
authored
Apr 13, 2018
by
Nick Thomas
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-use_docker_stable_in_examples' into 'master'
Use stable docker image instead of latest See merge request gitlab-org/gitlab-ce!18373
parents
3219cb29
b964b43e
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
21 deletions
+21
-21
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
using_docker_build.md
doc/ci/docker/using_docker_build.md
+11
-11
using_docker_images.md
doc/ci/docker/using_docker_images.md
+1
-1
browser_performance.md
doc/ci/examples/browser_performance.md
+2
-2
gitlab_runner_chart.md
doc/install/kubernetes/gitlab_runner_chart.md
+2
-2
builds.rb
spec/factories/ci/builds.rb
+1
-1
runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
Chef.gitlab-ci.yml
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
+1
-1
Docker.gitlab-ci.yml
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
+1
-1
No files found.
.gitlab-ci.yml
View file @
160f1fd2
...
...
@@ -721,7 +721,7 @@ codequality:
tags
:
[]
before_script
:
[]
services
:
-
docker:dind
-
docker:
stable-
dind
variables
:
SETUP_DB
:
"
false"
DOCKER_DRIVER
:
overlay2
...
...
doc/ci/docker/using_docker_build.md
View file @
160f1fd2
...
...
@@ -101,12 +101,12 @@ In order to do that, follow the steps:
--registration-token REGISTRATION_TOKEN \
--executor docker \
--description "My Docker Runner" \
--docker-image "docker:
latest
" \
--docker-image "docker:
stable
" \
--docker-privileged
```
The above command will register a new Runner to use the special
`docker:
latest
` image which is provided by Docker. **Notice that it's using
`docker:
stable
` image which is provided by Docker. **Notice that it's using
the `privileged` mode to start the build and service containers.** If you
want to use [docker-in-docker] mode, you always have to use `privileged = true`
in your Docker containers.
...
...
@@ -120,7 +120,7 @@ In order to do that, follow the steps:
executor = "docker"
[runners.docker]
tls_verify = false
image = "docker:
latest
"
image = "docker:
stable
"
privileged = true
disable_cache = false
volumes = ["/cache"]
...
...
@@ -132,7 +132,7 @@ In order to do that, follow the steps:
`docker:dind`
service):
```yaml
image: docker:
latest
image: docker:
stable
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
...
...
@@ -201,12 +201,12 @@ In order to do that, follow the steps:
--registration-token REGISTRATION_TOKEN \
--executor docker \
--description "My Docker Runner" \
--docker-image "docker:
latest
" \
--docker-image "docker:
stable
" \
--docker-volumes /var/run/docker.sock:/var/run/docker.sock
```
The above command will register a new Runner to use the special
`docker:
latest
` image which is provided by Docker. **Notice that it's using
`docker:
stable
` image which is provided by Docker. **Notice that it's using
the Docker daemon of the Runner itself, and any containers spawned by docker
commands will be siblings of the Runner rather than children of the runner.**
This may have complications and limitations that are unsuitable for your workflow.
...
...
@@ -220,7 +220,7 @@ In order to do that, follow the steps:
executor = "docker"
[runners.docker]
tls_verify = false
image = "docker:
latest
"
image = "docker:
stable
"
privileged = false
disable_cache = false
volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
...
...
@@ -232,7 +232,7 @@ In order to do that, follow the steps:
include the
`docker:dind`
service as when using the Docker in Docker executor):
```yaml
image: docker:
latest
image: docker:
stable
before_script:
- docker info
...
...
@@ -286,7 +286,7 @@ any image that's used with the `--cache-from` argument must first be pulled
Here's a simple
`.gitlab-ci.yml`
file showing how Docker caching can be utilized:
```
yaml
image
:
docker:
latest
image
:
docker:
stable
services
:
-
docker:dind
...
...
@@ -388,7 +388,7 @@ could look like:
```
yaml
build
:
image
:
docker:
latest
image
:
docker:
stable
services
:
-
docker:dind
stage
:
build
...
...
@@ -434,7 +434,7 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
an application-specific deploy script:
```
yaml
image
:
docker:
latest
image
:
docker:
stable
services
:
-
docker:dind
...
...
doc/ci/docker/using_docker_images.md
View file @
160f1fd2
...
...
@@ -86,7 +86,7 @@ services](#accessing-the-services).
### How the health check of services works
Services are designed to provide additional functionality which is
**network accessible**
.
It may be a database like MySQL, or Redis, and even
`docker:dind`
which
It may be a database like MySQL, or Redis, and even
`docker:
stable-
dind`
which
allows you to use Docker in Docker. It can be practically anything that is
required for the CI/CD job to proceed and is accessed by network.
...
...
doc/ci/examples/browser_performance.md
View file @
160f1fd2
...
...
@@ -17,7 +17,7 @@ performance:
variables
:
URL
:
https://example.com
services
:
-
docker:dind
-
docker:
stable-
dind
script
:
-
mkdir gitlab-exporter
-
wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
...
...
@@ -94,7 +94,7 @@ performance:
stage
:
performance
image
:
docker:git
services
:
-
docker:dind
-
docker:
stable-
dind
dependencies
:
-
review
script
:
...
...
doc/install/kubernetes/gitlab_runner_chart.md
View file @
160f1fd2
...
...
@@ -80,7 +80,7 @@ runners:
image
:
ubuntu:16.04
## Run all containers with the privileged flag enabled
## This will allow the docker:dind image to run if you need to run Docker
## This will allow the docker:
stable-
dind image to run if you need to run Docker
## commands. Please read the docs before turning this on:
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
##
...
...
@@ -147,7 +147,7 @@ enable privileged mode in `values.yaml`:
```
yaml
runners
:
## Run all containers with the privileged flag enabled
## This will allow the docker:dind image to run if you need to run Docker
## This will allow the docker:
stable-
dind image to run if you need to run Docker
## commands. Please read the docs before turning this on:
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
##
...
...
spec/factories/ci/builds.rb
View file @
160f1fd2
...
...
@@ -206,7 +206,7 @@ FactoryBot.define do
options
do
{
image:
{
name:
'ruby:2.1'
,
entrypoint:
'/bin/sh'
},
services:
[
'postgres'
,
{
name:
'docker:dind'
,
entrypoint:
'/bin/sh'
,
command:
'sleep 30'
,
alias:
'docker'
}],
services:
[
'postgres'
,
{
name:
'docker:
stable-
dind'
,
entrypoint:
'/bin/sh'
,
command:
'sleep 30'
,
alias:
'docker'
}],
after_script:
%w(ls date)
,
artifacts:
{
name:
'artifacts_file'
,
...
...
spec/requests/api/runner_spec.rb
View file @
160f1fd2
...
...
@@ -406,7 +406,7 @@ describe API::Runner do
expect
(
json_response
[
'image'
]).
to
eq
({
'name'
=>
'ruby:2.1'
,
'entrypoint'
=>
'/bin/sh'
})
expect
(
json_response
[
'services'
]).
to
eq
([{
'name'
=>
'postgres'
,
'entrypoint'
=>
nil
,
'alias'
=>
nil
,
'command'
=>
nil
},
{
'name'
=>
'docker:dind'
,
'entrypoint'
=>
'/bin/sh'
,
{
'name'
=>
'docker:
stable-
dind'
,
'entrypoint'
=>
'/bin/sh'
,
'alias'
=>
'docker'
,
'command'
=>
'sleep 30'
}])
expect
(
json_response
[
'steps'
]).
to
eq
(
expected_steps
)
expect
(
json_response
[
'artifacts'
]).
to
eq
(
expected_artifacts
)
...
...
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
View file @
160f1fd2
...
...
@@ -7,7 +7,7 @@
image
:
"
chef/chefdk"
services
:
-
docker:dind
-
docker:
stable-
dind
variables
:
DOCKER_HOST
:
"
tcp://docker:2375"
...
...
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
View file @
160f1fd2
...
...
@@ -2,7 +2,7 @@
image
:
docker:latest
services
:
-
docker:dind
-
docker:
stable-
dind
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment