Updating to fix DockerBuild Settings, Fixes #1869

rshade · rshade · commit 69acb41a86e0 · 2025-02-26T16:47:12.000-06:00
diff --git a/aws-py-voting-app/__main__.py b/aws-py-voting-app/__main__.py
@@ -6,6 +6,7 @@
 import pulumi
 import pulumi_aws as aws
 import pulumi_docker as docker
+import pulumi_docker_build as docker_build
 
 # Get the password to use for Redis from the pulumi config
 config = pulumi.Config()
@@ -18,7 +19,9 @@
 # Creating a VPC and a public subnet
 app_vpc = aws.ec2.Vpc("app-vpc", cidr_block="172.31.0.0/16", enable_dns_hostnames=True)
 
-app_vpc_subnet = aws.ec2.Subnet("app-vpc-subnet", cidr_block="172.31.32.0/20", vpc_id=app_vpc.id)
+app_vpc_subnet = aws.ec2.Subnet(
+    "app-vpc-subnet", cidr_block="172.31.32.0/20", vpc_id=app_vpc.id
+)
 
 # Creating a gateway to the web for the VPC
 app_gateway = aws.ec2.InternetGateway("app-gateway", vpc_id=app_vpc.id)
@@ -143,10 +146,6 @@
     port=redis_port,
     protocol="TCP",
     target_type="ip",
-    stickiness=aws.lb.TargetGroupStickinessArgs(
-        enabled=False,
-        type="lb_cookie",
-    ),
     vpc_id=app_vpc.id,
 )
 
@@ -166,7 +165,9 @@
     port=redis_port,
     protocol="TCP",
     default_actions=[
-        aws.lb.ListenerDefaultActionArgs(type="forward", target_group_arn=redis_targetgroup.arn)
+        aws.lb.ListenerDefaultActionArgs(
+            type="forward", target_group_arn=redis_targetgroup.arn
+        )
     ],
 )
 
@@ -235,10 +236,6 @@
     port=80,
     protocol="TCP",
     target_type="ip",
-    stickiness=aws.lb.TargetGroupStickinessArgs(
-        enabled=False,
-        type="lb_cookie",
-    ),
     vpc_id=app_vpc.id,
 )
 
@@ -258,7 +255,9 @@
     port=80,
     protocol="TCP",
     default_actions=[
-        aws.lb.ListenerDefaultActionArgs(type="forward", target_group_arn=flask_targetgroup.arn)
+        aws.lb.ListenerDefaultActionArgs(
+            type="forward", target_group_arn=flask_targetgroup.arn
+        )
     ],
 )
 
@@ -271,17 +270,25 @@ def get_registry_info(rid):
     parts = decoded.split(":")
     if len(parts) != 2:
         raise Exception("Invalid credentials")
-    return docker.ImageRegistry(creds.proxy_endpoint, parts[0], parts[1])
+    return docker_build.RegistryArgs(
+        address=creds.proxy_endpoint, username=parts[0], password=parts[1]
+    )
 
 
 app_registry = app_ecr_repo.registry_id.apply(get_registry_info)
 
-flask_image = docker.Image(
+flask_image_dockerbuild = docker_build.Image(
     "flask-dockerimage",
-    image_name=app_ecr_repo.repository_url,
-    build="./frontend",
-    skip_push=False,
-    registry=app_registry,
+    tags=[
+        app_ecr_repo.repository_url.apply(
+            lambda repository_url: f"{repository_url}:latest"
+        ),
+    ],
+    context=docker_build.BuildContextArgs(
+        location="./frontend",
+    ),
+    push=True,
+    registries=[app_registry],
 )
 
 # Creating a task definition for the Flask instance.
@@ -298,15 +305,17 @@ def get_registry_info(rid):
         [
             {
                 "name": "flask-container",
-                "image": flask_image.image_name,
+                "image": flask_image_dockerbuild.ref,
                 "memory": 512,
                 "essential": True,
-                "portMappings": [{"containerPort": 80, "hostPort": 80, "protocol": "tcp"}],
+                "portMappings": [
+                    {"containerPort": 80, "hostPort": 80, "protocol": "tcp"}
+                ],
                 "environment": [  # The Redis endpoint we created is given to Flask, allowing it to communicate with the former
                     {"name": "REDIS", "value": redis_endpoint["host"]},
                     {
                         "name": "REDIS_PORT",
-                        "value": redis_endpoint["port"].apply(lambda x: str(x)),
+                        "value": pulumi.Output.concat(str(redis_endpoint["port"])),
                     },
                     {"name": "REDIS_PWD", "value": redis_password},
                 ],
diff --git a/aws-py-voting-app/requirements.txt b/aws-py-voting-app/requirements.txt
@@ -1,3 +1,4 @@
 pulumi>=3.5.1,<4.0.0
 pulumi-aws>=6.0.2,<7.0.0
 pulumi-docker>=4.6.0,<4.7.0
+pulumi-docker-build>=0.0.10
diff --git a/azure-cs-appservice-docker/Azure.AppService.Docker.csproj b/azure-cs-appservice-docker/Azure.AppService.Docker.csproj
@@ -1,16 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Pulumi" Version="3.*" />
-    <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
-    <PackageReference Include="Pulumi.Docker" Version="4.*" />
-    <PackageReference Include="Pulumi.Random" Version="4.*" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Pulumi" Version="3.*" />
+        <PackageReference Include="Pulumi.AzureNative" Version="2.*" />
+        <PackageReference Include="Pulumi.DockerBuild" Version="0.0.10" />
+        <PackageReference Include="Pulumi.Random" Version="4.*" />
+    </ItemGroup>
 
 </Project>
diff --git a/azure-cs-appservice-docker/MyStack.cs b/azure-cs-appservice-docker/MyStack.cs
@@ -6,8 +6,8 @@
 using Pulumi.AzureNative.Resources;
 using Pulumi.AzureNative.Web;
 using Pulumi.AzureNative.Web.Inputs;
-using Pulumi.Docker;
-using Pulumi.Random;
+using DockerBuild = Pulumi.DockerBuild;
+
 
 class MyStack : Stack
 {
@@ -61,31 +61,40 @@ public MyStack()
         //
         var customImage = "node-app";
 
-        var registry = new Registry("myregistry", new RegistryArgs
+        var registry = new Registry("myregistry", new Pulumi.AzureNative.ContainerRegistry.RegistryArgs
         {
             ResourceGroupName = resourceGroup.Name,
             Sku = new SkuArgs { Name = "Basic" },
             AdminUserEnabled = true
         });
 
         var credentials = ListRegistryCredentials.Invoke(new ListRegistryCredentialsInvokeArgs
-            {
-                ResourceGroupName = resourceGroup.Name,
-                RegistryName = registry.Name
-            });
+        {
+            ResourceGroupName = resourceGroup.Name,
+            RegistryName = registry.Name
+        });
         var adminUsername = credentials.Apply(c => c.Username ?? "");
         var adminPassword = credentials.Apply(c => Output.CreateSecret(c.Passwords.First().Value ?? ""));
 
-        var myImage = new Image(customImage, new ImageArgs
+        var myImage = new DockerBuild.Image(customImage, new Pulumi.DockerBuild.ImageArgs
         {
-            ImageName = Output.Format($"{registry.LoginServer}/{customImage}:v1.0.0"),
-            Build = new DockerBuild { Context = $"./{customImage}" },
-            Registry = new ImageRegistry
+            Context = new DockerBuild.Inputs.BuildContextArgs
             {
-                Server = registry.LoginServer,
-                Username = adminUsername,
-                Password = adminPassword
+                Location = $"./{customImage}",
             },
+            Tags = new[]
+            {
+                Output.Format($"{registry.LoginServer}/{customImage}:v1.0.0"),
+            },
+            Push = true,
+            Registries = new[]{
+                new DockerBuild.Inputs.RegistryArgs
+                {
+                    Address = registry.LoginServer,
+                    Username = adminUsername,
+                    Password = adminPassword,
+                }
+            }
         });
 
         var getStartedApp = new WebApp("get-started", new WebAppArgs
@@ -123,7 +132,7 @@ public MyStack()
                     }
                 },
                 AlwaysOn = true,
-                LinuxFxVersion = Output.Format($"DOCKER|{myImage.ImageName}")
+                LinuxFxVersion = Output.Format($"DOCKER|{myImage.Ref}")
             },
             HttpsOnly = true
         });
