Added examples with ECR import

Author: Ben Fortuna

.gitignore

@@ -1,3 +1,5 @@
 # Created by .ignore support plugin (hsz.mobi)
 terraform-aws-ecr-repository.iml
 .terraform/
+*.tfvars
+*tfstate*

Makefile

@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
-TERRAFORM_VERSION=0.12.24
-TERRAFORM=docker run --rm -v "${PWD}:/work" -v "${HOME}:/root" -e AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) -e http_proxy=$(http_proxy) --net=host -w /work hashicorp/terraform:$(TERRAFORM_VERSION)
+TERRAFORM_VERSION=0.13.4
+TERRAFORM=docker run --rm -it -v "${PWD}:/work" -v "${HOME}:/root" -e AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) -e http_proxy=$(http_proxy) --net=host -w /work hashicorp/terraform:$(TERRAFORM_VERSION)
 
 TERRAFORM_DOCS=docker run --rm -v "${PWD}:/work" tmknom/terraform-docs
 
@@ -34,7 +34,8 @@ docs: diagram
 
 format:
 	$(TERRAFORM) fmt -list=true ./ && \
-		$(TERRAFORM) fmt -list=true ./examples/nginx
+		$(TERRAFORM) fmt -list=true ./examples/nginx && \
+		$(TERRAFORM) fmt -list=true ./examples/apachesling
 
 example:
 	$(TERRAFORM) init examples/$(EXAMPLE) && $(TERRAFORM) plan examples/$(EXAMPLE)

examples/apachesling/main.tf

@@ -0,0 +1,17 @@
+module "repository" {
+  source = "../.."
+
+  name                       = "apache/sling"
+  scan_on_push               = var.scan_on_push
+  untagged_image_expiry_days = var.untagged_image_expiry_days
+}
+
+module "import" {
+  count  = length(var.source_tags)
+  source = "figurate/docker-container/docker//modules/ecr"
+
+  command    = ["push", "apache/sling", var.source_tags[count.index]]
+  depends_on = [module.repository]
+  rm         = false
+  aws_region = var.aws_region
+}

examples/apachesling/provider.tf

@@ -0,0 +1,3 @@
+provider "docker" {
+  host = "tcp://127.0.0.1:2375/"
+}

examples/apachesling/vars.tf

@@ -0,0 +1,20 @@
+variable "scan_on_push" {
+  description = "Automatically scan pushed images for vulnerabilities"
+  default     = true
+}
+
+variable "untagged_image_expiry_days" {
+  description = "Age (in days) of untagged images to be removed automatically"
+  type        = number
+  default     = 7
+}
+
+variable "source_tags" {
+  description = "A list of tags for image import from external registry"
+  type        = list(string)
+  default     = ["latest"]
+}
+
+variable "aws_region" {
+  description = "AWS region for running ECR commands"
+}

examples/apachesling/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    docker = {
+      source  = "terraform-providers/docker"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}

examples/nginx/main.tf

@@ -4,6 +4,13 @@ module "repository" {
   name                       = "nginx"
   scan_on_push               = var.scan_on_push
   untagged_image_expiry_days = var.untagged_image_expiry_days
-  import_frequency           = var.import_frequency
-  source_tags                = var.source_tags
+}
+
+module "import" {
+  count  = length(var.source_tags)
+  source = "figurate/docker-container/docker//modules/ecr"
+
+  command    = ["push", "nginx", var.source_tags[count.index]]
+  depends_on = [module.repository]
+  rm         = false
 }

examples/nginx/provider.tf

@@ -0,0 +1,3 @@
+provider "docker" {
+  host = "tcp://127.0.0.1:2375/"
+}

examples/nginx/vars.tf

@@ -9,11 +9,6 @@ variable "untagged_image_expiry_days" {
   default     = 7
 }
 
-variable "import_frequency" {
-  description = "Indicates how often to check the source registry for updates (once, weekly, daily, hourly, always)"
-  default     = "daily"
-}
-
 variable "source_tags" {
   description = "A list of tags for image import from external registry"
   type        = list(string)

examples/nginx/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    docker = {
+      source  = "terraform-providers/docker"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}