Commit 403df257 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'selhorn-docker-explanation-attempt' into 'master'

Added more detailed explanations

See merge request gitlab-org/gitlab!54119
parents 48380e4b 0e4dabb2
......@@ -8,11 +8,18 @@ type: index
# Docker integration
GitLab CI/CD can be combined with [Docker](https://www.docker.com) to enable
integration between the two.
There are two primary ways to incorporate [Docker](https://www.docker.com) in your CI/CD workflow.
The following documentation is available for using GitLab CI/CD with Docker:
- **[Run your CI/CD jobs](using_docker_images.md) in Docker containers.**
- [Building Docker images with GitLab CI/CD](using_docker_build.md).
- [Using Docker images](using_docker_images.md).
- [Building images with kaniko and GitLab CI/CD](using_kaniko.md).
You can create CI/CD jobs to do things like test, build, or publish
an application. These jobs can run in Docker containers.
For example, you can tell GitLab CI/CD to use a Node image that's hosted on Docker Hub
or in the GitLab Container Registry. Your job then runs in a container that's based on the image.
The container has all the Node dependencies you need to build your app.
- **Use [Docker](using_docker_build.md) or [kaniko](using_kaniko.md) to build Docker images.**
You can create CI/CD jobs to build Docker images and publish
them to a container registry.
......@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: concepts, howto
---
# Building Docker images with GitLab CI/CD
# Use Docker to build Docker images
You can use GitLab CI/CD with Docker Engine to build and test Docker-based projects.
......
......@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: concepts, howto
---
# Using Docker images
# Run your CI/CD jobs in Docker containers
GitLab CI/CD in conjunction with [GitLab Runner](../runners/README.md) can use
[Docker Engine](https://www.docker.com/) to test and build any application.
......
......@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: howto
---
# Building images with kaniko and GitLab CI/CD
# Use kaniko to build Docker images
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/45512) in GitLab 11.2. Requires GitLab Runner 11.2 and above.
......
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