Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b964b43e
Commit
b964b43e
authored
Apr 13, 2018
by
Philippe Lafoucrière
Committed by
Nick Thomas
Apr 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use stable docker image instead of latest
parent
3219cb29
Changes
9
Show 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
doc/ci/docker/using_docker_build.md
doc/ci/docker/using_docker_build.md
+11
-11
doc/ci/docker/using_docker_images.md
doc/ci/docker/using_docker_images.md
+1
-1
doc/ci/examples/browser_performance.md
doc/ci/examples/browser_performance.md
+2
-2
doc/install/kubernetes/gitlab_runner_chart.md
doc/install/kubernetes/gitlab_runner_chart.md
+2
-2
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+1
-1
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
+1
-1
No files found.
.gitlab-ci.yml
View file @
b964b43e
...
@@ -721,7 +721,7 @@ codequality:
...
@@ -721,7 +721,7 @@ codequality:
tags
:
[]
tags
:
[]
before_script
:
[]
before_script
:
[]
services
:
services
:
-
docker:dind
-
docker:
stable-
dind
variables
:
variables
:
SETUP_DB
:
"
false"
SETUP_DB
:
"
false"
DOCKER_DRIVER
:
overlay2
DOCKER_DRIVER
:
overlay2
...
...
doc/ci/docker/using_docker_build.md
View file @
b964b43e
...
@@ -101,12 +101,12 @@ In order to do that, follow the steps:
...
@@ -101,12 +101,12 @@ In order to do that, follow the steps:
--registration-token REGISTRATION_TOKEN \
--registration-token REGISTRATION_TOKEN \
--executor docker \
--executor docker \
--description "My Docker Runner" \
--description "My Docker Runner" \
--docker-image "docker:
latest
" \
--docker-image "docker:
stable
" \
--docker-privileged
--docker-privileged
```
```
The above command will register a new Runner to use the special
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
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`
want to use [docker-in-docker] mode, you always have to use `privileged = true`
in your Docker containers.
in your Docker containers.
...
@@ -120,7 +120,7 @@ In order to do that, follow the steps:
...
@@ -120,7 +120,7 @@ In order to do that, follow the steps:
executor = "docker"
executor = "docker"
[runners.docker]
[runners.docker]
tls_verify = false
tls_verify = false
image = "docker:
latest
"
image = "docker:
stable
"
privileged = true
privileged = true
disable_cache = false
disable_cache = false
volumes = ["/cache"]
volumes = ["/cache"]
...
@@ -132,7 +132,7 @@ In order to do that, follow the steps:
...
@@ -132,7 +132,7 @@ In order to do that, follow the steps:
`docker:dind`
service):
`docker:dind`
service):
```yaml
```yaml
image: docker:
latest
image: docker:
stable
# When using dind, it's wise to use the overlayfs driver for
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
# improved performance.
...
@@ -201,12 +201,12 @@ In order to do that, follow the steps:
...
@@ -201,12 +201,12 @@ In order to do that, follow the steps:
--registration-token REGISTRATION_TOKEN \
--registration-token REGISTRATION_TOKEN \
--executor docker \
--executor docker \
--description "My Docker Runner" \
--description "My Docker Runner" \
--docker-image "docker:
latest
" \
--docker-image "docker:
stable
" \
--docker-volumes /var/run/docker.sock:/var/run/docker.sock
--docker-volumes /var/run/docker.sock:/var/run/docker.sock
```
```
The above command will register a new Runner to use the special
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
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.**
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.
This may have complications and limitations that are unsuitable for your workflow.
...
@@ -220,7 +220,7 @@ In order to do that, follow the steps:
...
@@ -220,7 +220,7 @@ In order to do that, follow the steps:
executor = "docker"
executor = "docker"
[runners.docker]
[runners.docker]
tls_verify = false
tls_verify = false
image = "docker:
latest
"
image = "docker:
stable
"
privileged = false
privileged = false
disable_cache = false
disable_cache = false
volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
...
@@ -232,7 +232,7 @@ In order to do that, follow the steps:
...
@@ -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):
include the
`docker:dind`
service as when using the Docker in Docker executor):
```yaml
```yaml
image: docker:
latest
image: docker:
stable
before_script:
before_script:
- docker info
- docker info
...
@@ -286,7 +286,7 @@ any image that's used with the `--cache-from` argument must first be pulled
...
@@ -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:
Here's a simple
`.gitlab-ci.yml`
file showing how Docker caching can be utilized:
```
yaml
```
yaml
image
:
docker:
latest
image
:
docker:
stable
services
:
services
:
-
docker:dind
-
docker:dind
...
@@ -388,7 +388,7 @@ could look like:
...
@@ -388,7 +388,7 @@ could look like:
```
yaml
```
yaml
build
:
build
:
image
:
docker:
latest
image
:
docker:
stable
services
:
services
:
-
docker:dind
-
docker:dind
stage
:
build
stage
:
build
...
@@ -434,7 +434,7 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
...
@@ -434,7 +434,7 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
an application-specific deploy script:
an application-specific deploy script:
```
yaml
```
yaml
image
:
docker:
latest
image
:
docker:
stable
services
:
services
:
-
docker:dind
-
docker:dind
...
...
doc/ci/docker/using_docker_images.md
View file @
b964b43e
...
@@ -86,7 +86,7 @@ services](#accessing-the-services).
...
@@ -86,7 +86,7 @@ services](#accessing-the-services).
### How the health check of services works
### How the health check of services works
Services are designed to provide additional functionality which is
**network accessible**
.
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
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.
required for the CI/CD job to proceed and is accessed by network.
...
...
doc/ci/examples/browser_performance.md
View file @
b964b43e
...
@@ -17,7 +17,7 @@ performance:
...
@@ -17,7 +17,7 @@ performance:
variables
:
variables
:
URL
:
https://example.com
URL
:
https://example.com
services
:
services
:
-
docker:dind
-
docker:
stable-
dind
script
:
script
:
-
mkdir gitlab-exporter
-
mkdir gitlab-exporter
-
wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
-
wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
...
@@ -94,7 +94,7 @@ performance:
...
@@ -94,7 +94,7 @@ performance:
stage
:
performance
stage
:
performance
image
:
docker:git
image
:
docker:git
services
:
services
:
-
docker:dind
-
docker:
stable-
dind
dependencies
:
dependencies
:
-
review
-
review
script
:
script
:
...
...
doc/install/kubernetes/gitlab_runner_chart.md
View file @
b964b43e
...
@@ -80,7 +80,7 @@ runners:
...
@@ -80,7 +80,7 @@ runners:
image
:
ubuntu:16.04
image
:
ubuntu:16.04
## Run all containers with the privileged flag enabled
## 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:
## commands. Please read the docs before turning this on:
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
##
##
...
@@ -147,7 +147,7 @@ enable privileged mode in `values.yaml`:
...
@@ -147,7 +147,7 @@ enable privileged mode in `values.yaml`:
```
yaml
```
yaml
runners
:
runners
:
## Run all containers with the privileged flag enabled
## 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:
## commands. Please read the docs before turning this on:
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
## ref: https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-dind
##
##
...
...
spec/factories/ci/builds.rb
View file @
b964b43e
...
@@ -206,7 +206,7 @@ FactoryBot.define do
...
@@ -206,7 +206,7 @@ FactoryBot.define do
options
do
options
do
{
{
image:
{
name:
'ruby:2.1'
,
entrypoint:
'/bin/sh'
},
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)
,
after_script:
%w(ls date)
,
artifacts:
{
artifacts:
{
name:
'artifacts_file'
,
name:
'artifacts_file'
,
...
...
spec/requests/api/runner_spec.rb
View file @
b964b43e
...
@@ -406,7 +406,7 @@ describe API::Runner do
...
@@ -406,7 +406,7 @@ describe API::Runner do
expect
(
json_response
[
'image'
]).
to
eq
({
'name'
=>
'ruby:2.1'
,
'entrypoint'
=>
'/bin/sh'
})
expect
(
json_response
[
'image'
]).
to
eq
({
'name'
=>
'ruby:2.1'
,
'entrypoint'
=>
'/bin/sh'
})
expect
(
json_response
[
'services'
]).
to
eq
([{
'name'
=>
'postgres'
,
'entrypoint'
=>
nil
,
expect
(
json_response
[
'services'
]).
to
eq
([{
'name'
=>
'postgres'
,
'entrypoint'
=>
nil
,
'alias'
=>
nil
,
'command'
=>
nil
},
'alias'
=>
nil
,
'command'
=>
nil
},
{
'name'
=>
'docker:dind'
,
'entrypoint'
=>
'/bin/sh'
,
{
'name'
=>
'docker:
stable-
dind'
,
'entrypoint'
=>
'/bin/sh'
,
'alias'
=>
'docker'
,
'command'
=>
'sleep 30'
}])
'alias'
=>
'docker'
,
'command'
=>
'sleep 30'
}])
expect
(
json_response
[
'steps'
]).
to
eq
(
expected_steps
)
expect
(
json_response
[
'steps'
]).
to
eq
(
expected_steps
)
expect
(
json_response
[
'artifacts'
]).
to
eq
(
expected_artifacts
)
expect
(
json_response
[
'artifacts'
]).
to
eq
(
expected_artifacts
)
...
...
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
View file @
b964b43e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
image
:
"
chef/chefdk"
image
:
"
chef/chefdk"
services
:
services
:
-
docker:dind
-
docker:
stable-
dind
variables
:
variables
:
DOCKER_HOST
:
"
tcp://docker:2375"
DOCKER_HOST
:
"
tcp://docker:2375"
...
...
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
View file @
b964b43e
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
image
:
docker:latest
image
:
docker:latest
services
:
services
:
-
docker:dind
-
docker:
stable-
dind
before_script
:
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
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