Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ee4a4eca
Commit
ee4a4eca
authored
May 28, 2020
by
Suzanne Selhorn
Committed by
Marcel Amirault
May 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: Updated titles
Related to new UI text:
https://gitlab.com/gitlab-org/gitlab/-/issues/207830
parent
9eb2d34f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
doc/ci/cloud_deployment/index.md
doc/ci/cloud_deployment/index.md
+12
-12
doc/topics/autodevops/index.md
doc/topics/autodevops/index.md
+1
-1
No files found.
doc/ci/cloud_deployment/index.md
View file @
ee4a4eca
...
@@ -13,7 +13,7 @@ that come with the needed libraries and tools pre-installed.
...
@@ -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
By referencing them in your CI/CD pipeline, you'll be able to interact with your chosen
cloud provider more easily.
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.
> [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:
...
@@ -49,23 +49,23 @@ Some credentials are required to be able to run `aws` commands:
```
```
NOTE:
**Note:**
NOTE:
**Note:**
Please note that t
he image used in the example above
T
he image used in the example above
(
`registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest`
) is hosted on the
[
GitLab
(
`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
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
Instead of referencing an image hosted on the GitLab Registry, you
can
reference an
y other image hosted on any third-party registry, such as
reference an
image hosted on any third-party registry, such as the
[
Amazon Elastic Container Registry (ECR)
](
https://aws.amazon.com/ecr/
)
.
[
Amazon Elastic Container Registry (ECR)
](
https://aws.amazon.com/ecr/
)
.
To do so,
please make sure to
[
push your image into 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
)
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`
Then reference
it in your
`.gitlab-ci.yml`
file and replace the
`image`
path to point to your ECR.
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.
> [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
...
@@ -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:
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
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:
1.
Add these variables to your project's
`.gitlab-ci.yml`
file:
```
yaml
```
yaml
...
...
doc/topics/autodevops/index.md
View file @
ee4a4eca
...
@@ -225,7 +225,7 @@ Variable. To do so, follow these steps:
...
@@ -225,7 +225,7 @@ Variable. To do so, follow these steps:
1.
Give this variable the value
`ECS`
before saving it.
1.
Give this variable the value
`ECS`
before saving it.
When you trigger a pipeline, if you have AutoDev Ops enabled and if you have correctly
When you trigger a pipeline, if you have AutoDev Ops enabled and if you have correctly
[
entered AWS credentials as environment variables
](
../../ci/cloud_deployment/index.md#deploy-your-application-to-aws-elastic-container-service-ecs
)
,
[
entered AWS credentials as environment variables
](
../../ci/cloud_deployment/index.md#deploy-your-application-to-
the-
aws-elastic-container-service-ecs
)
,
your application will be deployed to AWS ECS.
your application will be deployed to AWS ECS.
NOTE:
**Note:**
NOTE:
**Note:**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment