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-28 09:08:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-28 09:08:26 +0300
commit616129d41caac06a1ea0b0a36d1b3018eabac833 (patch)
tree687b31f7c5dd7cff0e626475a37c0bb114aad338 /doc/ci/cloud_deployment
parent9c3e48166e3533964b86d6b49cb83165a3a51092 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/cloud_deployment')
-rw-r--r--doc/ci/cloud_deployment/index.md24
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index 171776fe403..97f5b8f103b 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -13,7 +13,7 @@ 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.
-## AWS
+## Run AWS commands from GitLab CI/CD
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31167) in GitLab 12.6.
@@ -49,23 +49,23 @@ Some credentials are required to be able to run `aws` commands:
```
NOTE: **Note:**
- Please note that the image used in the example above
+ The image used in the example above
(`registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest`) is hosted on the [GitLab
Container Registry](../../user/packages/container_registry/index.md) and is
- ready to use. Alternatively, replace the image with another one hosted on [AWS ECR](#aws-ecr).
+ ready to use. Alternatively, replace the image with one hosted on AWS ECR.
-### AWS ECR
+## Use an AWS Elastic Container Registry (ECR) image in your CI/CD
-Instead of referencing an image hosted on the GitLab Registry, you are free to
-reference any other image hosted on any third-party registry, such as
+Instead of referencing an image hosted on the GitLab Registry, you can
+reference an image hosted on any third-party registry, such as the
[Amazon Elastic Container Registry (ECR)](https://aws.amazon.com/ecr/).
-To do so, please make sure to [push your image into your ECR
-repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)
-before referencing it in your `.gitlab-ci.yml` file and replace the `image`
-path to point to your ECR.
+To do so, [push your image into your ECR
+repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html).
+Then reference it in your `.gitlab-ci.yml` file and replace the `image`
+path to point to your ECR image.
-### Deploy your application to 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.
@@ -80,7 +80,7 @@ components, like an ECS service, ECS task definition, a database on AWS RDS, etc
After you're all set up on AWS ECS, follow these steps:
1. Make sure your AWS credentials are set up as environment variables for your
- project. You can follow [the steps above](#aws) to complete this setup.
+ project. You can follow [the steps above](#run-aws-commands-from-gitlab-cicd) to complete this setup.
1. Add these variables to your project's `.gitlab-ci.yml` file:
```yaml