summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-08-25 19:23:49 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-08-25 19:23:49 +0000
commitd97a6cbe633a285926dea6f8c7e210dcbaa1c0ec (patch)
tree2d62778902015011ea387f8b9f866c352ac5dae4 /doc
parent1bfba534a9c00ef739c5f77bd1f99e842ce60fa6 (diff)
downloadgitlab-ce-d97a6cbe633a285926dea6f8c7e210dcbaa1c0ec.tar.gz
Common Docker Documentation Location in `gitlab-ce`
Diffstat (limited to 'doc')
-rw-r--r--doc/install/README.md2
-rw-r--r--doc/install/docker.md18
2 files changed, 19 insertions, 1 deletions
diff --git a/doc/install/README.md b/doc/install/README.md
index 1d510cb29c3..656f8720361 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -17,7 +17,7 @@ the hardware requirements.
- [Installation from source](installation.md) - Install GitLab from source.
Useful for unsupported systems like *BSD. For an overview of the directory
structure, read the [structure documentation](structure.md).
-- [Docker](https://docs.gitlab.com/omnibus/docker/) - Install GitLab using Docker.
+- [Docker](docker.md) - Install GitLab using Docker.
## Install GitLab on cloud providers
diff --git a/doc/install/docker.md b/doc/install/docker.md
new file mode 100644
index 00000000000..933756072ff
--- /dev/null
+++ b/doc/install/docker.md
@@ -0,0 +1,18 @@
+# GitLab Docker images
+
+[Docker](https://www.docker.com) and container technology have been revolutionizing the software world for the past few years. They combine the performance and efficiency of native execution with the abstraction, security, and immutability of virtualization.
+
+GitLab provides official Docker images to allowing you to easily take advantage of the benefits of containerization while operating your GitLab instance.
+
+## Omnibus GitLab based images
+
+GitLab maintains a set of [official Docker images](https://hub.docker.com/r/gitlab) based on our [Omnibus GitLab package](https://docs.gitlab.com/omnibus/README.html). These images include:
+* [GitLab Community Edition](https://hub.docker.com/r/gitlab/gitlab-ce/)
+* [GitLab Enterprise Edition](https://hub.docker.com/r/gitlab/gitlab-ee/)
+* [GitLab Runner](https://hub.docker.com/r/gitlab/gitlab-runner/)
+
+A [complete usage guide](https://docs.gitlab.com/omnibus/docker/) to these images is available, as well as the [Dockerfile used for building the images](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master/docker).
+
+## Cloud native images
+
+GitLab is also working towards a [cloud native set of containers](https://gitlab.com/charts/helm.gitlab.io#docker-container-images), with a single image for each component service. We intend for these images to eventually replace the [Omnibus GitLab based images](#omnibus-gitlab-based-images).