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
Léo-Paul Géneau
gitlab-ce
Commits
35008f34
Commit
35008f34
authored
Feb 21, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mr-origin-8390' into 'master'
Update using_docker_images.md See merge request !9417
parents
b1da8f0f
420797f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
doc/ci/docker/using_docker_images.md
doc/ci/docker/using_docker_images.md
+9
-6
No files found.
doc/ci/docker/using_docker_images.md
View file @
35008f34
...
@@ -39,13 +39,15 @@ accessible during the build process.
...
@@ -39,13 +39,15 @@ accessible during the build process.
## What is an image
## What is an image
The
`image`
keyword is the name of the docker image that is present in the
The
`image`
keyword is the name of the docker image the docker executor
local Docker Engine (list all images with
`docker images`
) or any image that
will run to perform the CI tasks.
can be found at
[
Docker Hub
][
hub
]
. For more information about images and Docker
Hub please read the
[
Docker Fundamentals
][]
documentation.
In short, with
`image`
we refer to the docker image, which will be used to
By default the executor will only pull images from
[
Docker Hub
][
hub
]
,
create a container on which your job will run.
but this can be configured in the
`gitlab-runner/config.toml`
by setting
the
[
docker pull policy
][]
to allow using local images.
For more information about images and Docker Hub please read
the
[
Docker Fundamentals
][]
documentation.
## What is a service
## What is a service
...
@@ -271,6 +273,7 @@ containers as well as all volumes (`-v`) that were created with the container
...
@@ -271,6 +273,7 @@ containers as well as all volumes (`-v`) that were created with the container
creation.
creation.
[
Docker Fundamentals
]:
https://docs.docker.com/engine/understanding-docker/
[
Docker Fundamentals
]:
https://docs.docker.com/engine/understanding-docker/
[
docker pull policy
]:
https://docs.gitlab.com/runner/executors/docker.html#how-pull-policies-work
[
hub
]:
https://hub.docker.com/
[
hub
]:
https://hub.docker.com/
[
linking-containers
]:
https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
[
linking-containers
]:
https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
[
tutum/wordpress
]:
https://hub.docker.com/r/tutum/wordpress/
[
tutum/wordpress
]:
https://hub.docker.com/r/tutum/wordpress/
...
...
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