Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 00:08:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 00:08:22 +0300
commitd7b136d5471b5925ff784f78b9c11ec63c2a3549 (patch)
tree6c4417fb367459613e84a2d34625abccd13e6405 /doc/ci/cloud_deployment
parent1ec60cf53bc498b12c597ff0d91434a1bdb7cba9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/cloud_deployment')
-rw-r--r--doc/ci/cloud_deployment/index.md13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index e59846e0f12..a1e722b131e 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -7,13 +7,18 @@ type: howto
# Cloud deployment
-Interacting with a major cloud provider such as Amazon AWS may have become a much needed task that's
+Interacting with a major cloud provider may have become a much needed task that's
part of your delivery process. GitLab is making this process less painful by providing Docker images
that come with the needed libraries and tools pre-installed.
By referencing them in your CI/CD pipeline, you'll be able to interact with your chosen
cloud provider more easily.
-## Run AWS commands from GitLab CI/CD
+## AWS
+
+GitLab provides Docker images to simplify working with AWS, and a template to make
+it easier to [deploy to AWS](#deploy-your-application-to-the-aws-elastic-container-service-ecs).
+
+### Run AWS commands from GitLab CI/CD
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31167) in GitLab 12.6.
@@ -54,7 +59,7 @@ Some credentials are required to be able to run `aws` commands:
Container Registry](../../user/packages/container_registry/index.md) and is
ready to use. Alternatively, replace the image with one hosted on AWS ECR.
-## Use an AWS Elastic Container Registry (ECR) image in your CI/CD
+### Use an AWS Elastic Container Registry (ECR) image in your CI/CD
Instead of referencing an image hosted on the GitLab Registry, you can
reference an image hosted on any third-party registry, such as the
@@ -65,7 +70,7 @@ repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-e
Then reference it in your `.gitlab-ci.yml` file and replace the `image`
path to point to your ECR image.
-## Deploy your application to the AWS Elastic Container Service (ECS)
+### Deploy your application to the AWS Elastic Container Service (ECS)
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207962) in GitLab 12.9.