Merge branch 'conroy/ecrgc' of https://github.com/aws/aws-cdk into co…

…nroy/ecrgc
aws · Oct 24, 2024 · d99ec7e · d99ec7e
2 parents 5bb09be + 0878e53
commit d99ec7e
Show file tree

Hide file tree

Showing 30 changed files with 122 additions and 86 deletions.
diff --git a/...ebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json b/...ebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json
@@ -173,7 +173,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -254,4 +254,4 @@
    ]
   }
  }
-}
+}
diff --git a/...k-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json b/...k-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json
@@ -140,7 +140,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -209,4 +209,4 @@
    ]
   }
  }
-}
+}
diff --git a/...aws-codebuild/test/integ.defaults.lit.js.snapshot/codebuild-default-project.template.json b/...aws-codebuild/test/integ.defaults.lit.js.snapshot/codebuild-default-project.template.json
@@ -132,7 +132,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -188,4 +188,4 @@
    ]
   }
  }
-}
+}
diff --git a/.../integ.github-webhook-batch.js.snapshot/test-codebuild-github-webhook-batch.template.json b/.../integ.github-webhook-batch.js.snapshot/test-codebuild-github-webhook-batch.template.json
@@ -145,7 +145,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -222,4 +222,4 @@
    ]
   }
  }
-}
+}
diff --git a/...nteg/test/aws-codebuild/test/integ.github.js.snapshot/test-codebuild-github.template.json b/...nteg/test/aws-codebuild/test/integ.github.js.snapshot/test-codebuild-github.template.json
@@ -98,7 +98,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -155,4 +155,4 @@
    ]
   }
  }
-}
+}
diff --git a/.../test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json b/.../test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json
@@ -133,7 +133,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_LARGE",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -199,4 +199,4 @@
    ]
   }
  }
-}
+}
diff --git a/...t-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json b/...t-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json
@@ -148,7 +148,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -204,4 +204,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ct-file-system-location.js.snapshot/aws-cdk-codebuild-file-system-locations.template.json b/...ct-file-system-location.js.snapshot/aws-cdk-codebuild-file-system-locations.template.json
@@ -383,7 +383,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": true,
      "Type": "LINUX_CONTAINER"
@@ -509,4 +509,4 @@
    ]
   }
  }
-}
+}
diff --git a/...-codebuild/test/integ.project-logging.js.snapshot/aws-cdk-codebuild-logging.template.json b/...-codebuild/test/integ.project-logging.js.snapshot/aws-cdk-codebuild-logging.template.json
@@ -192,7 +192,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -261,4 +261,4 @@
    ]
   }
  }
-}
+}
diff --git a/...d/test/integ.project-notification.js.snapshot/aws-cdk-codebuild-project-vpc.template.json b/...d/test/integ.project-notification.js.snapshot/aws-cdk-codebuild-project-vpc.template.json
@@ -132,7 +132,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -241,4 +241,4 @@
    ]
   }
  }
-}
+}
diff --git a/...sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json b/...sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json
@@ -170,7 +170,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -256,4 +256,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ws-codebuild/test/integ.project-visibility.js.snapshot/codebuild-visibility.template.json b/...ws-codebuild/test/integ.project-visibility.js.snapshot/codebuild-visibility.template.json
@@ -171,7 +171,7 @@
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -234,4 +234,4 @@
    ]
   }
  }
-}
+}
diff --git a/...-codebuild/test/integ.project-vpc.js.snapshot/aws-cdk-codebuild-project-vpc.template.json b/...-codebuild/test/integ.project-vpc.js.snapshot/aws-cdk-codebuild-project-vpc.template.json
@@ -383,7 +383,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -489,4 +489,4 @@
    ]
   }
  }
-}
+}
diff --git a/...report-group-delete-reports.js.snapshot/aws-cdk-report-group-delete-reports.template.json b/...report-group-delete-reports.js.snapshot/aws-cdk-report-group-delete-reports.template.json
@@ -128,7 +128,7 @@
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -194,4 +194,4 @@
    ]
   }
  }
-}
+}
diff --git a/...test/aws-codebuild/test/integ.report-group.js.snapshot/aws-cdk-report-group.template.json b/...test/aws-codebuild/test/integ.report-group.js.snapshot/aws-cdk-report-group.template.json
@@ -148,7 +148,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -225,4 +225,4 @@
    ]
   }
  }
-}
+}
diff --git a/....pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json b/....pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json
@@ -482,7 +482,7 @@
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -580,4 +580,4 @@
    ]
   }
  }
-}
+}
diff --git a/...-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json b/...-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json
@@ -584,7 +584,7 @@
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -635,4 +635,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ine-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json b/...ine-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json
@@ -190,7 +190,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -847,4 +847,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ctions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json b/...ctions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json
@@ -841,7 +841,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -921,4 +921,4 @@
    ]
   }
  }
-}
+}
diff --git a/...h-pipeline-triggers.js.snapshot/aws-cdk-codepipeline-with-pipeline-triggers.template.json b/...h-pipeline-triggers.js.snapshot/aws-cdk-codepipeline-with-pipeline-triggers.template.json
@@ -194,7 +194,7 @@
                 },
                 "Environment": {
                     "ComputeType": "BUILD_GENERAL1_SMALL",
-                    "Image": "aws/codebuild/standard:1.0",
+                    "Image": "aws/codebuild/standard:7.0",
                     "ImagePullCredentialsType": "CODEBUILD",
                     "PrivilegedMode": false,
                     "Type": "LINUX_CONTAINER"
@@ -946,7 +946,7 @@
                 },
                 "Environment": {
                     "ComputeType": "BUILD_GENERAL1_SMALL",
-                    "Image": "aws/codebuild/standard:1.0",
+                    "Image": "aws/codebuild/standard:7.0",
                     "ImagePullCredentialsType": "CODEBUILD",
                     "PrivilegedMode": false,
                     "Type": "LINUX_CONTAINER"
@@ -1553,4 +1553,4 @@
             ]
         }
     }
-}
+}
diff --git a/...t/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json b/...t/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json
@@ -831,7 +831,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -979,4 +979,4 @@
    ]
   }
  }
-}
+}
diff --git a/...3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json b/...3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json
@@ -178,7 +178,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -885,4 +885,4 @@
    ]
   }
  }
-}
+}
diff --git a/...ts/test/codebuild/integ.project-events.js.snapshot/aws-cdk-codebuild-events.template.json b/...ts/test/codebuild/integ.project-events.js.snapshot/aws-cdk-codebuild-events.template.json
@@ -221,7 +221,7 @@
     },
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"
@@ -518,4 +518,4 @@
    ]
   }
  }
-}
+}
diff --git a/...start-build.js.snapshot/aws-stepfunctions-tasks-codebuild-start-build-integ.template.json b/...start-build.js.snapshot/aws-stepfunctions-tasks-codebuild-start-build-integ.template.json
@@ -139,7 +139,7 @@
        "Value": "defaultZone"
       }
      ],
-     "Image": "aws/codebuild/standard:1.0",
+     "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
      "Type": "LINUX_CONTAINER"