Update aws-ts-lambda-thumbnailer to use latest awsx (#1424)

pulumi · May 16, 2023 · f3dc070 · f3dc070
1 parent c6b4c8e
commit f3dc070
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/...humbnailer/docker-ffmpeg-thumb/Dockerfile → aws-ts-lambda-thumbnailer/app/Dockerfile b/...humbnailer/docker-ffmpeg-thumb/Dockerfile → aws-ts-lambda-thumbnailer/app/Dockerfile
diff --git a/...bnailer/docker-ffmpeg-thumb/ffmpeg.tar.xz → aws-ts-lambda-thumbnailer/app/ffmpeg.tar.xz b/...bnailer/docker-ffmpeg-thumb/ffmpeg.tar.xz → aws-ts-lambda-thumbnailer/app/ffmpeg.tar.xz
diff --git a/...-thumbnailer/docker-ffmpeg-thumb/index.js → aws-ts-lambda-thumbnailer/app/index.js b/...-thumbnailer/docker-ffmpeg-thumb/index.js → aws-ts-lambda-thumbnailer/app/index.js
diff --git a/aws-ts-lambda-thumbnailer/index.ts b/aws-ts-lambda-thumbnailer/index.ts
@@ -6,20 +6,27 @@ import * as awsx from "@pulumi/awsx";
 // A bucket to store videos and thumbnails.
 const bucket = new aws.s3.Bucket("bucket");
 
-const image = awsx.ecr.buildAndPushImage("sampleapp", {
-    context: "./docker-ffmpeg-thumb",
+const repo = new awsx.ecr.Repository("repo", {
+    forceDelete: true,
 });
+
+const image = new awsx.ecr.Image("image", {
+    repositoryUrl: repo.url,
+    path: "./app",
+});
+
 const role = new aws.iam.Role("thumbnailerRole", {
     assumeRolePolicy: aws.iam.assumeRolePolicyForPrincipal({ Service: "lambda.amazonaws.com" }),
 });
+
 const lambdaS3Access =  new aws.iam.RolePolicyAttachment("lambdaFullAccess", {
     role: role.name,
     policyArn: aws.iam.ManagedPolicy.AWSLambdaExecute,
 });
 
 const thumbnailer = new aws.lambda.Function("thumbnailer", {
     packageType: "Image",
-    imageUri: image.imageValue,
+    imageUri: image.imageUri,
     role: role.arn,
     timeout: 900,
 });

diff --git a/aws-ts-lambda-thumbnailer/package.json b/aws-ts-lambda-thumbnailer/package.json
@@ -4,7 +4,7 @@
     "main": "index.js",
     "dependencies": {
         "@pulumi/aws": "^5.0.0",
-        "@pulumi/awsx": "^0.40.0",
+        "@pulumi/awsx": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0"
     }
 }