Updating from docker to docker-build, fixes #1791

rshade · rshade · commit fb1a9a1c85d2 · 2025-01-14T15:40:29.000-06:00
diff --git a/aws-js-langserve/package.json b/aws-js-langserve/package.json
@@ -4,6 +4,6 @@
     "dependencies": {
         "@pulumi/pulumi": "3.145.0",
         "@pulumi/aws": "6.66.3",
-        "@pulumi/docker": "4.6.0"
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/aws-ts-hello-fargate/package.json b/aws-ts-hello-fargate/package.json
@@ -7,7 +7,7 @@
     "dependencies": {
         "@pulumi/aws": "6.66.3",
         "@pulumi/awsx": "2.20.0",
-        "@pulumi/docker": "4.6.0",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/aws-ts-langserve/index.ts b/aws-ts-langserve/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as aws from "@pulumi/aws";
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as pulumi from "@pulumi/pulumi";
 
 const config = new pulumi.Config();
@@ -58,12 +58,9 @@ const langserveEcrLifeCyclePolicy = new aws.ecr.LifecyclePolicy("langserve-ecr-l
         }],
     }),
 });
-const langserveEcrImage = new docker.Image("langserve-ecr-image", {
-    build: {
-        platform: "linux/amd64",
-        context: containerContext,
-        dockerfile: containerFile,
-    },
+const langserveEcrImage = new dockerbuild.Image("langserve-ecr-image", {
+    context: { location: "." },
+    platforms: ["linux/amd64"],
     imageName: langserveEcrRepository.repositoryUrl,
     registry: {
         server: langserveEcrRepository.repositoryUrl,
diff --git a/aws-ts-langserve/package.json b/aws-ts-langserve/package.json
@@ -7,6 +7,6 @@
 		"typescript": "^4.0.0",
 		"@pulumi/pulumi": "3.145.0",
 		"@pulumi/aws": "6.66.3",
-		"@pulumi/docker": "4.6.0"
+		"@pulumi/docker-build": "^0.0.8"
 	}
 }
diff --git a/aws-ts-localai-flowise/package.json b/aws-ts-localai-flowise/package.json
@@ -8,8 +8,8 @@
     "@pulumi/pulumi": "3.145.0",
     "@pulumi/eks": "3.7.0",
     "@pulumi/aws": "6.66.3",
-    "@pulumi/docker": "4.6.0",
     "@pulumi/kubernetes": "4.19.0",
-    "@pinecone-database/pulumi": "^0.4.0"
+    "@pinecone-database/pulumi": "^0.4.0",
+    "@pulumi/docker-build": "^0.0.8"
   }
 }
diff --git a/azure-ts-appservice-docker/index.ts b/azure-ts-appservice-docker/index.ts
@@ -1,6 +1,6 @@
 // Copyright 2016-2020, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as pulumi from "@pulumi/pulumi";
 
 import * as containerregistry from "@pulumi/azure-native/containerregistry";
@@ -62,14 +62,14 @@ const credentials = containerregistry.listRegistryCredentialsOutput({
 const adminUsername = credentials.apply(credentials => credentials.username!);
 const adminPassword = credentials.apply(credentials => credentials.passwords![0].value!);
 
-const myImage = new docker.Image(customImage, {
+const myImage = new dockerbuild.Image(customImage, {
     imageName: pulumi.interpolate`${registry.loginServer}/${customImage}:v1.0.0`,
-    build: { context: `./${customImage}` },
-    registry: {
-        server: registry.loginServer,
-        username: adminUsername,
-        password: adminPassword,
-    },
+    context: { location: "." }` },
+    registries: [{
+                                address: "",
+                                username: "",
+                                password: adminPassword
+                            }],
 });
 
 const getStartedApp = new web.WebApp("getStartedApp", {
diff --git a/azure-ts-appservice-docker/package.json b/azure-ts-appservice-docker/package.json
@@ -6,7 +6,7 @@
     },
     "dependencies": {
         "@pulumi/azure-native": "2.82.0",
-        "@pulumi/docker": "4.6.0",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/azure-ts-containerapps/index.ts b/azure-ts-containerapps/index.ts
@@ -1,6 +1,6 @@
 // Copyright 2016-2021, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as pulumi from "@pulumi/pulumi";
 
 import * as app from "@pulumi/azure-native/app";
@@ -50,14 +50,14 @@ const adminUsername = credentials.apply((c: containerregistry.ListRegistryCreden
 const adminPassword = credentials.apply((c: containerregistry.ListRegistryCredentialsResult) => c.passwords![0].value!);
 
 const customImage = "node-app";
-const myImage = new docker.Image(customImage, {
+const myImage = new dockerbuild.Image(customImage, {
     imageName: pulumi.interpolate`${registry.loginServer}/${customImage}:v1.0.0`,
-    build: { context: `./${customImage}` },
-    registry: {
-        server: registry.loginServer,
-        username: adminUsername,
-        password: adminPassword,
-    },
+    context: { location: "." }` },
+    registries: [{
+                                address: "",
+                                username: "",
+                                password: adminPassword
+                            }],
 });
 
 const containerApp = new app.ContainerApp("app", {
diff --git a/azure-ts-containerapps/package.json b/azure-ts-containerapps/package.json
@@ -6,7 +6,7 @@
     },
     "dependencies": {
         "@pulumi/azure-native": "2.82.0",
-        "@pulumi/docker": "4.6.0",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/classic-azure-ts-aks-keda/keda.ts b/classic-azure-ts-aks-keda/keda.ts
@@ -1,7 +1,7 @@
 // Copyright 2016-2019, Pulumi Corporation.  All rights reserved.
 
 import * as azure from "@pulumi/azure";
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as k8s from "@pulumi/kubernetes";
 import * as pulumi from "@pulumi/pulumi";
 
@@ -87,16 +87,14 @@ export class KedaStorageQueueHandler extends pulumi.ComponentResource {
         const registry = args.service.registry;
 
         // Deploy the docker image of the Function App
-        const dockerImage = new docker.Image("image", {
+        const dockerImage = new dockerbuild.Image("image", {
             imageName: pulumi.interpolate`${registry.loginServer}/${args.queue.name}:v1.0.0`,
-            build: {
-                context: args.path,
-            },
-            registry: {
-                server: registry.loginServer,
-                username: registry.adminUsername,
-                password: registry.adminPassword,
-            },
+            context: { location: "." },
+            registries: [{
+                                address: "",
+                                username: "",
+                                password: registry.adminPassword
+                            }],
         }, { parent: this });
 
         // Put the storage account connection string into a secret
diff --git a/classic-azure-ts-aks-keda/package.json b/classic-azure-ts-aks-keda/package.json
@@ -7,11 +7,11 @@
     "dependencies": {
         "@pulumi/azure": "6.15.0",
         "@pulumi/azuread": "6.1.0",
-        "@pulumi/docker": "4.6.0",
         "@pulumi/kubernetes": "4.19.0",
         "@pulumi/pulumi": "3.145.0",
         "@pulumi/random": "4.16.8",
-        "@pulumi/tls": "5.0.10"
+        "@pulumi/tls": "5.0.10",
+        "@pulumi/docker-build": "^0.0.8"
     },
     "license": "Apache-2.0"
 }
diff --git a/classic-azure-ts-cosmosapp-component/aci.ts b/classic-azure-ts-cosmosapp-component/aci.ts
@@ -1,7 +1,7 @@
 // Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
 import * as azure from "@pulumi/azure";
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as pulumi from "@pulumi/pulumi";
 import { CosmosApp, GlobalContext, RegionalContext } from "./cosmosApp";
 
@@ -21,16 +21,14 @@ function buildContainerApp({ cosmosAccount, database, container, opts }: GlobalC
         sku: "Premium",
     }, opts);
 
-    const dockerImage = new docker.Image("node-app", {
+    const dockerImage = new dockerbuild.Image("node-app", {
         imageName: pulumi.interpolate`${registry.loginServer}/mynodeapp:v1.0.0`,
-        build: {
-            context: "./container",
-        },
-        registry: {
-            server: registry.loginServer,
-            username: registry.adminUsername,
-            password: registry.adminPassword,
-        },
+        context: { location: "./container" },
+        registries: [{
+                                address: "",
+                                username: "",
+                                password: registry.adminPassword
+                            }],
     }, opts);
 
     return ({ location }: RegionalContext) => {
diff --git a/classic-azure-ts-cosmosapp-component/package.json b/classic-azure-ts-cosmosapp-component/package.json
@@ -10,8 +10,8 @@
     "dependencies": {
         "@azure/cosmos": "latest",
         "@pulumi/azure": "6.15.0",
-        "@pulumi/docker": "4.6.0",
         "@pulumi/pulumi": "3.145.0",
-        "@pulumi/random": "4.16.8"
+        "@pulumi/random": "4.16.8",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/docker-ts-multi-container-app/index.ts b/docker-ts-multi-container-app/index.ts
@@ -1,6 +1,6 @@
 // Copyright 2016-2021, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as pulumi from "@pulumi/pulumi";
 
 // Set defaults for redis
@@ -30,11 +30,9 @@ const redisContainer = new docker.Container("redisContainer", {
 });
 
 // Create image from local app
-const appImage = new docker.Image("appImage", {
-    build: {
-        context: "./app",
-    },
-    imageName: "app",
+const appImage = new dockerbuild.Image("appImage", {
+    context: { location: "./app" },
+    tags: ["app"],
     skipPush: true,
 });
 
diff --git a/docker-ts-multi-container-app/package.json b/docker-ts-multi-container-app/package.json
@@ -4,7 +4,7 @@
         "@types/node": "10.17.60"
     },
     "dependencies": {
-        "@pulumi/docker": "4.6.0",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/gcp-ts-cloudrun/index.ts b/gcp-ts-cloudrun/index.ts
@@ -1,6 +1,6 @@
 // Copyright 2016-2020, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as gcp from "@pulumi/gcp";
 import * as pulumi from "@pulumi/pulumi";
 
@@ -46,13 +46,10 @@ export const helloUrl = helloService.statuses[0].url;
 // Build a Docker image from our sample Ruby app and put it to Google Container Registry.
 // Note: Run `gcloud auth configure-docker` in your command line to configure auth to GCR.
 const imageName = "ruby-app";
-const myImage = new docker.Image(imageName, {
+const myImage = new dockerbuild.Image(imageName, {
     imageName: pulumi.interpolate`gcr.io/${gcp.config.project}/${imageName}:v1.0.0`,
-    build: {
-        context: "./app",
-        platform: "linux/amd64",
-
-    },
+    context: { location: "./app" },
+    platforms: ["linux/amd64"],
 });
 
 // Deploy to Cloud Run. Some extra parameters like concurrency and memory are set for illustration purpose.
diff --git a/gcp-ts-cloudrun/package.json b/gcp-ts-cloudrun/package.json
@@ -6,8 +6,8 @@
         "@types/node": "12.20.55"
     },
     "dependencies": {
-        "@pulumi/docker": "4.6.0",
         "@pulumi/gcp": "8.13.1",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/index.ts b/gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/index.ts
@@ -2,7 +2,7 @@
 
 import * as pulumi from "@pulumi/pulumi";
 import * as gcp from "@pulumi/gcp";
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 
 const location = gcp.config.region || "us-central1";
 
diff --git a/gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/package.json b/gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/package.json
@@ -4,8 +4,8 @@
         "@types/node": "12.20.55"
     },
     "dependencies": {
-        "@pulumi/docker": "4.6.0",
         "@pulumi/gcp": "8.13.1",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/index.ts b/gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/index.ts
@@ -1,18 +1,16 @@
 // Copyright 2016-2020, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as gcp from "@pulumi/gcp";
 import * as pulumi from "@pulumi/pulumi";
 
 // Build and push image to gcr repository
 
 const imageName = "ruby-app";
 
-const myImage = new docker.Image(imageName, {
+const myImage = new dockerbuild.Image(imageName, {
     imageName: pulumi.interpolate`gcr.io/${gcp.config.project}/${imageName}:latest`,
-    build: {
-        context: "./app",
-    },
+    context: { location: "./app" },
 });
 
 // Digest exported so it's easy to match updates happening in cloud run project
diff --git a/gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/package.json b/gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/package.json
@@ -4,8 +4,8 @@
         "@types/node": "12.20.55"
     },
     "dependencies": {
-        "@pulumi/docker": "4.6.0",
         "@pulumi/gcp": "8.13.1",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/gcp-ts-k8s-ruby-on-rails-postgresql/infra/index.ts b/gcp-ts-k8s-ruby-on-rails-postgresql/infra/index.ts
@@ -1,14 +1,14 @@
 // Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
-import * as docker from "@pulumi/docker";
+import * as dockerbuild from "@pulumi/docker-build";
 import * as k8s from "@pulumi/kubernetes";
 import * as pulumi from "@pulumi/pulumi";
 import * as cluster from "./cluster";
 import * as config from "./config";
 import * as db from "./db";
 
 // Get the GCR repository for our app container, and build and publish the app image.
-const appImage = new docker.Image("rails-app", {
+const appImage = new dockerbuild.Image("rails-app", {
     imageName: `${config.dockerUsername}/${pulumi.getProject()}_${pulumi.getStack()}`,
     build: "../app",
     registry: {
diff --git a/gcp-ts-k8s-ruby-on-rails-postgresql/infra/package.json b/gcp-ts-k8s-ruby-on-rails-postgresql/infra/package.json
@@ -4,9 +4,9 @@
         "@types/node": "8.10.66"
     },
     "dependencies": {
-        "@pulumi/docker": "4.6.0",
         "@pulumi/gcp": "8.13.1",
         "@pulumi/kubernetes": "4.19.0",
-        "@pulumi/pulumi": "3.145.0"
+        "@pulumi/pulumi": "3.145.0",
+        "@pulumi/docker-build": "^0.0.8"
     }
 }
diff --git a/google-native-ts-k8s-python-postgresql/infra/index.ts b/google-native-ts-k8s-python-postgresql/infra/index.ts
diff --git a/google-native-ts-k8s-python-postgresql/infra/package.json b/google-native-ts-k8s-python-postgresql/infra/package.json
diff --git a/google-native-ts-k8s-ruby-on-rails-postgresql/infra/index.ts b/google-native-ts-k8s-ruby-on-rails-postgresql/infra/index.ts
diff --git a/google-native-ts-k8s-ruby-on-rails-postgresql/infra/package.json b/google-native-ts-k8s-ruby-on-rails-postgresql/infra/package.json

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"@pulumi/pulumi": "3.145.0",`
`6`	`6`	`"@pulumi/aws": "6.66.3",`
`7`		`- "@pulumi/docker": "4.6.0"`
	`7`	`+ "@pulumi/docker-build": "^0.0.8"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"dependencies": {`
`8`	`8`	`"@pulumi/aws": "6.66.3",`
`9`	`9`	`"@pulumi/awsx": "2.20.0",`
`10`		`- "@pulumi/docker": "4.6.0",`
`11`		`- "@pulumi/pulumi": "3.145.0"`
	`10`	`+ "@pulumi/pulumi": "3.145.0",`
	`11`	`+ "@pulumi/docker-build": "^0.0.8"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`"typescript": "^4.0.0",`
`8`	`8`	`"@pulumi/pulumi": "3.145.0",`
`9`	`9`	`"@pulumi/aws": "6.66.3",`
`10`		`- "@pulumi/docker": "4.6.0"`
	`10`	`+ "@pulumi/docker-build": "^0.0.8"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`"@pulumi/pulumi": "3.145.0",`
`9`	`9`	`"@pulumi/eks": "3.7.0",`
`10`	`10`	`"@pulumi/aws": "6.66.3",`
`11`		`- "@pulumi/docker": "4.6.0",`
`12`	`11`	`"@pulumi/kubernetes": "4.19.0",`
`13`		`- "@pinecone-database/pulumi": "^0.4.0"`
	`12`	`+ "@pinecone-database/pulumi": "^0.4.0",`
	`13`	`+ "@pulumi/docker-build": "^0.0.8"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"dependencies": {`
`8`	`8`	`"@pulumi/azure-native": "2.82.0",`
`9`		`- "@pulumi/docker": "4.6.0",`
`10`		`- "@pulumi/pulumi": "3.145.0"`
	`9`	`+ "@pulumi/pulumi": "3.145.0",`
	`10`	`+ "@pulumi/docker-build": "^0.0.8"`
`11`	`11`	`}`
`12`	`12`	`}`