From 9f40323c6ea7dc58501000355e9412160625ce4e Mon Sep 17 00:00:00 2001 From: arnol377 Date: Tue, 27 Aug 2024 14:53:16 -0400 Subject: [PATCH] updating --- .terraform.lock.hcl | 34 +++++++++++------------ docker-loging | 1 - docker.tf | 68 +++++++++++++++++++++------------------------ 3 files changed, 49 insertions(+), 54 deletions(-) delete mode 100644 docker-loging diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 370d37e..d4cb985 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.63.0" - constraints = ">= 4.20.1" + version = "5.64.0" + constraints = ">= 3.0.0, >= 4.20.1" hashes = [ - "h1:mhVxzwfSZVxPJNZsr1fvKZe51+48BdM7pzWChVQ4v68=", - "zh:21f3a6870dd80b8312b6aac28784b29a7c2cf072175f0de943f09bddbf14cad6", - "zh:28feb0621baeaa9b6992a6209fd0d7ad1c665b1dd895123f2fd36d91d69d116f", - "zh:301d51b398c3e3488ea2b63defeb254436854c83046d9fc5ca129b13faaa4319", - "zh:343e89645a2b23363226e2e0571639637ac1ddf7fa8c562bf883b17c8ad30d7d", - "zh:56c89148fc105a1bf32ffcd574ec1e679144377ea26c9ae4211dd491a3def358", - "zh:5e3b88e3eb28b23819126d43b191a2bda28a09d7690aee7e577b3b6235c4824a", - "zh:64c21f3b38a8f0f0ef8b938df71cde76d77e010236bb6a0b46f66daa6cab6f99", - "zh:6869e5fafe6535954ac75ece63e9765d6b12d1752b54cf9639a01585f1a5583e", - "zh:90a6894868c585a5abf00e784723d74ea80aff3d0403b36028c4b08c5c4894d6", - "zh:92e9e4b7c183e518c1decd0fbc780e9f1941d05710c9c20329c78556a7f0adac", + "h1:Xasb457vfMG/1SGu6KSApCzAqUHMlsL028OQu3dZVv8=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:bbc053d060d4f6e95ef60549a0e92487fbbd88807f8161507cc389edc7dde0f7", - "zh:cfd8e88029a2fdafdfa77688f966705ade9211d173cbb6aa1552839c9993c19a", - "zh:d291875c26a6a05b60e02f1481c296269080232fa0ae86cce5caa04a6df82ed6", - "zh:f42f0b81587de0c51859e37cd671c442d8eaf42558d83c6421b1e46549576f89", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/docker-loging b/docker-loging deleted file mode 100644 index 46cb184..0000000 --- a/docker-loging +++ /dev/null @@ -1 +0,0 @@ -docker login -u AWS -p .dkr.ecr..amazonaws.com diff --git a/docker.tf b/docker.tf index 951851c..ba4dfd7 100644 --- a/docker.tf +++ b/docker.tf @@ -1,42 +1,36 @@ -resource "aws_ecr_repository" "repo" { - name = "csvd-census-docker-repo" - image_tag_mutability = "MUTABLE" - - image_scanning_configuration { - scan_on_push = true - } -} - locals { + # public.ecr.aws/ubuntu/nginx:1.18-20.04_beta + # public.ecr.aws/ubuntu/ubuntu:22.04_edge + # public.ecr.aws/ubuntu/ubuntu:24.10 + ubuntu_images = [ + "22.04_edge", "23.10", "24.10", "22.04_stable" + ] image_config = [ - { + for image in local.ubuntu_images : { enabled = true dest_path = null - name = "ubuntu/ubuntu" + name = "ubuntu" source_image = "ubuntu/ubuntu" source_registry = "public.ecr.aws" - source_tag = "edge" - tag = "edge" - }, + source_tag = image + tag = image + } ] } -module "images" { - source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade" - - profile = "docker-image-pipeline" +module "ecr-clone" { + source = "HappyPathway/ecr-clone/aws" application_name = "docker-image-pipeline" - image_config = local.image_config - tags = {} - - enable_lifecycle_policy = true - lifecycle_policy_all = true - force_delete = true + application_list = [ + "pipeline-test" + ] + image_config = local.image_config + tags = {} } module "docker" { source = "HappyPathway/image-pipeline/aws" - project_name = "docker-image-pipeline" + project_name = "pipeline-test" builder_image = "aws/codebuild/standard:7.0" create_new_repo = false create_new_role = true @@ -62,22 +56,24 @@ module "docker" { name = aws_s3_bucket.assets_bucket.bucket key = "image-pipeline-ansible-playbooks.zip" } - playbook = "hello-world.yaml" + playbook = "ubuntu-base.yaml" goss_source_type = "S3" goss_bucket = { name = aws_s3_bucket.assets_bucket.bucket key = "image-pipeline-goss-testing.zip" } - goss_profile = "base-test" - state = local.state_config - vpc_config = local.vpc_config + docker_test_enabled = true + goss_profile = "base-test" + state = local.state_config + vpc_config = local.vpc_config image = { - repo = aws_ecr_repository.repo.name - tag = "latest" - source_image = "public.ecr.aws/ubuntu/ubuntu:edge" + # source image metadata + source_image = "ubuntu" + source_tag = "24.10" + source_docker_repo = "docker-image-pipeline" + # destination image metadata + dest_image = "pipeline-test" + dest_tag = "latest" + dest_docker_repo = "docker-image-pipeline" } } - -output docker_repo { - value = aws_ecr_repository.repo -}