Merge branch 'main' into native-remote-builds

Author: myftija

apps/webapp/app/v3/getDeploymentImageRef.server.ts

@@ -6,6 +6,7 @@ import {
   type Tag,
   RepositoryNotFoundException,
   GetAuthorizationTokenCommand,
+  PutLifecyclePolicyCommand,
 } from "@aws-sdk/client-ecr";
 import { STSClient, AssumeRoleCommand } from "@aws-sdk/client-sts";
 import { tryCatch } from "@trigger.dev/core";
@@ -213,7 +214,14 @@ async function createEcrRepository({
   const result = await ecr.send(
     new CreateRepositoryCommand({
       repositoryName,
-      imageTagMutability: "IMMUTABLE",
+      imageTagMutability: "IMMUTABLE_WITH_EXCLUSION",
+      imageTagMutabilityExclusionFilters: [
+        {
+          // only the `cache` tag will be mutable, all other tags will be immutable
+          filter: "cache",
+          filterType: "WILDCARD",
+        },
+      ],
       encryptionConfiguration: {
         encryptionType: "AES256",
       },
@@ -227,6 +235,30 @@ async function createEcrRepository({
     throw new Error(`Failed to create ECR repository: ${repositoryName}`);
   }
 
+  // When the `cache` tag is mutated, the old cache images are untagged.
+  // This policy matches those images and expires them to avoid bloating the repository.
+  await ecr.send(
+    new PutLifecyclePolicyCommand({
+      repositoryName: result.repository.repositoryName,
+      registryId: result.repository.registryId,
+      lifecyclePolicyText: JSON.stringify({
+        rules: [
+          {
+            rulePriority: 1,
+            description: "Expire untagged images older than 3 days",
+            selection: {
+              tagStatus: "untagged",
+              countType: "sinceImagePushed",
+              countUnit: "days",
+              countNumber: 3,
+            },
+            action: { type: "expire" },
+          },
+        ],
+      }),
+    })
+  );
+
   return result.repository;
 }
 

apps/webapp/package.json

@@ -29,7 +29,7 @@
     "@ai-sdk/openai": "^1.3.23",
     "@ariakit/react": "^0.4.6",
     "@ariakit/react-core": "^0.4.6",
-    "@aws-sdk/client-ecr": "^3.839.0",
+    "@aws-sdk/client-ecr": "^3.931.0",
     "@aws-sdk/client-sqs": "^3.445.0",
     "@aws-sdk/client-sts": "^3.840.0",
     "@better-auth/utils": "^0.2.6",