Skip to content

Commit

Permalink
Merge pull request #7 from trussworks/replace-circleci-docker-primary
Browse files Browse the repository at this point in the history
Replace circleci docker primary
  • Loading branch information
ralren authored Sep 21, 2020
2 parents e17ebb3 + 3faac6b commit 385c03d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2.1

references:
circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:822fac1c30f3bb7d5d595bed5d2dc86265c4f2f0
circleci_beep: &circleci_beep trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c

jobs:
validate:
docker:
- image: *circleci_docker_primary
- image: *circleci_beep
steps:
- checkout
- restore_cache:
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ Creates the following resources:

## Terraform Versions

Terraform 0.12: Pin module version to ~> 2.0.0. Submit pull requests to master branch.
Terraform 0.11: Pin module version to ~> 1.0.0. Submit pull requests to terraform011 branch.
Terraform 0.13: Pin module version to ~> 3.X. Submit pull requests to master branch.

Terraform 0.12: Pin module version to ~> 2.X. Submit pull requests to terraform012 branch.

Terraform 0.11: Pin module version to ~> 1.X. Submit pull requests to terraform011 branch.

## Usage

Expand All @@ -37,14 +40,14 @@ module "rds-snapshot-cleaner" {

| Name | Version |
|------|---------|
| terraform | ~> 0.12.0 |
| aws | ~> 2.70 |
| terraform | ~> 0.13.0 |
| aws | ~> 3.0 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 2.70 |
| aws | ~> 3.0 |

## Inputs

Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = "~> 0.12.0"
required_version = "~> 0.13.0"

required_providers {
aws = "~> 2.70"
aws = "~> 3.0"
}
}

0 comments on commit 385c03d

Please sign in to comment.