Browse Source

change image and compute type

Yuki Takei 3 years ago
parent
commit
8be35c1d19

+ 2 - 0
packages/app/docker/codebuild/buildspec/root.yml

@@ -7,6 +7,7 @@ batch:
       buildspec: packages/app/docker/codebuild/buildspec/image.yml
       env:
         image: aws/codebuild/standard:6.0
+        compute-type: BUILD_GENERAL1_LARGE
         type: LINUX_CONTAINER
         variables:
           TAG_VERSION: latest
@@ -15,6 +16,7 @@ batch:
       buildspec: packages/app/docker/codebuild/buildspec/image.yml
       env:
         image: aws/codebuild/amazonlinux2-aarch64-standard:2.0
+        compute-type: BUILD_GENERAL1_LARGE
         type: ARM_CONTAINER
         variables:
           TAG_VERSION: latest

+ 1 - 2
packages/app/docker/codebuild/codebuild.tf

@@ -15,8 +15,7 @@ module "codebuild" {
   buildspec           = "packages/app/docker/codebuild/buildspec/root.yml"
 
   # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-available.html
-  build_image         = "aws/codebuild/standard:6.0"
-  build_compute_type  = "BUILD_GENERAL1_LARGE"
+  build_image         = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
 
   privileged_mode     = true
 

+ 15 - 4
packages/app/docker/codebuild/terraform.tfstate

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.3.7",
-  "serial": 181,
+  "serial": 183,
   "lineage": "7413839f-c67c-02f5-4933-fcb84251bb29",
   "outputs": {},
   "resources": [
@@ -325,7 +325,7 @@
             "environment": [
               {
                 "certificate": "",
-                "compute_type": "BUILD_GENERAL1_LARGE",
+                "compute_type": "BUILD_GENERAL1_SMALL",
                 "environment_variable": [
                   {
                     "name": "AWS_REGION",
@@ -353,7 +353,7 @@
                     "value": "TRUE"
                   }
                 ],
-                "image": "aws/codebuild/standard:6.0",
+                "image": "aws/codebuild/amazonlinux2-x86_64-standard:3.0",
                 "image_pull_credentials_type": "CODEBUILD",
                 "privileged_mode": true,
                 "registry_credential": [],
@@ -754,7 +754,18 @@
           "private": "bnVsbA==",
           "dependencies": [
             "data.aws_iam_policy_document.policy_document",
-            "module.oidc_github.data.aws_iam_policy_document.assume_role"
+            "module.codebuild.aws_codebuild_project.default",
+            "module.codebuild.aws_codebuild_source_credential.authorization",
+            "module.codebuild.aws_iam_role.default",
+            "module.codebuild.aws_s3_bucket.cache_bucket",
+            "module.codebuild.data.aws_caller_identity.default",
+            "module.codebuild.data.aws_iam_policy_document.role",
+            "module.codebuild.data.aws_region.default",
+            "module.codebuild.random_string.bucket_prefix",
+            "module.oidc_github.aws_iam_openid_connect_provider.github",
+            "module.oidc_github.data.aws_iam_openid_connect_provider.github",
+            "module.oidc_github.data.aws_iam_policy_document.assume_role",
+            "module.oidc_github.data.tls_certificate.github"
           ]
         }
       ]