summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-06-19 18:33:58 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-06-19 18:33:58 +0000
commite4eeba4e4b33c327d5c95a48103ab5781d15c77c (patch)
tree170ed627df4a6582822c4ff315ae9854c58c9b6a
parent365670d814bf57396a9ce02190fa297d15c79cb9 (diff)
parent81015cb65ebf753043e74cb179358607ae9cc98b (diff)
downloadgitlab-ce-e4eeba4e4b33c327d5c95a48103ab5781d15c77c.tar.gz
Merge branch 'docs/object-storage' into 'master'
Add info about artifacts object storage in docs See merge request !12208
-rw-r--r--doc/administration/job_artifacts.md14
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md
index 5599435564e..3587696225c 100644
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
@@ -46,7 +46,10 @@ To disable artifacts site-wide, follow the steps below.
After a successful job, GitLab Runner uploads an archive containing the job
artifacts to GitLab.
-To change the location where the artifacts are stored, follow the steps below.
+### Using local storage
+
+To change the location where the artifacts are stored locally, follow the steps
+below.
---
@@ -82,6 +85,13 @@ _The artifacts are stored by default in
1. Save the file and [restart GitLab][] for the changes to take effect.
+### Using object storage
+
+In [GitLab Enterprise Edition Premium][eep] you can use an object storage like
+AWS S3 to store the artifacts.
+
+[Learn how to use the object storage option.][ee-os]
+
## Expiring artifacts
If an expiry date is used for the artifacts, they are marked for deletion
@@ -148,3 +158,5 @@ memory and disk I/O.
[reconfigure gitlab]: restart_gitlab.md "How to restart GitLab"
[restart gitlab]: restart_gitlab.md "How to restart GitLab"
[gitlab workhorse]: https://gitlab.com/gitlab-org/gitlab-workhorse "GitLab Workhorse repository"
+[ee-os]: https://docs.gitlab.com/ee/administration/job_artifacts.html#using-object-storage
+[eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium"