Skip to content

Commit 8e0ac4c

Browse files
rshadershade
committed
Updating from docker to docker-build, fixes #1791 
1 parent 72dc9da commit 8e0ac4c

File tree

27 files changed

+51
-51
lines changed

27 files changed

+51
-51
lines changed

‎aws-js-langserve/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"dependencies": {
55
"@pulumi/pulumi": "3.145.0",
66
"@pulumi/aws": "6.66.3",
7-
"@pulumi/docker": "4.6.0"
7+
"@pulumi/docker-build": "^0.0.8"
88
}
99
}

‎aws-ts-hello-fargate/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@pulumi/aws": "6.66.3",
99
"@pulumi/awsx": "2.19.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"
1212
}
1313
}

‎aws-ts-langserve/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import * as aws from "@pulumi/aws";
16-
import * as docker from "@pulumi/docker";
16+
import * as docker from "@pulumi/docker-build";
1717
import * as pulumi from "@pulumi/pulumi";
1818

1919
const config = new pulumi.Config();
@@ -58,7 +58,7 @@ const langserveEcrLifeCyclePolicy = new aws.ecr.LifecyclePolicy("langserve-ecr-l
5858
}],
5959
}),
6060
});
61-
const langserveEcrImage = new docker.Image("langserve-ecr-image", {
61+
const langserveEcrImage = new docker.BuildImage("langserve-ecr-image", {
6262
build: {
6363
platform: "linux/amd64",
6464
context: containerContext,

‎aws-ts-langserve/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"typescript": "^4.0.0",
88
"@pulumi/pulumi": "3.145.0",
99
"@pulumi/aws": "6.66.3",
10-
"@pulumi/docker": "4.6.0"
10+
"@pulumi/docker-build": "^0.0.8"
1111
}
1212
}

‎aws-ts-localai-flowise/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@pulumi/pulumi": "3.145.0",
99
"@pulumi/eks": "3.7.0",
1010
"@pulumi/aws": "6.66.3",
11-
"@pulumi/docker": "4.6.0",
1211
"@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"
1414
}
1515
}

‎azure-ts-appservice-docker/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2016-2020, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as pulumi from "@pulumi/pulumi";
55

66
import * as containerregistry from "@pulumi/azure-native/containerregistry";
@@ -62,7 +62,7 @@ const credentials = containerregistry.listRegistryCredentialsOutput({
6262
const adminUsername = credentials.apply(credentials => credentials.username!);
6363
const adminPassword = credentials.apply(credentials => credentials.passwords![0].value!);
6464

65-
const myImage = new docker.Image(customImage, {
65+
const myImage = new docker.BuildImage(customImage, {
6666
imageName: pulumi.interpolate`${registry.loginServer}/${customImage}:v1.0.0`,
6767
build: { context: `./${customImage}` },
6868
registry: {

‎azure-ts-appservice-docker/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"dependencies": {
88
"@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"
1111
}
1212
}

‎azure-ts-containerapps/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2016-2021, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as pulumi from "@pulumi/pulumi";
55

66
import * as app from "@pulumi/azure-native/app";
@@ -50,7 +50,7 @@ const adminUsername = credentials.apply((c: containerregistry.ListRegistryCreden
5050
const adminPassword = credentials.apply((c: containerregistry.ListRegistryCredentialsResult) => c.passwords![0].value!);
5151

5252
const customImage = "node-app";
53-
const myImage = new docker.Image(customImage, {
53+
const myImage = new docker.BuildImage(customImage, {
5454
imageName: pulumi.interpolate`${registry.loginServer}/${customImage}:v1.0.0`,
5555
build: { context: `./${customImage}` },
5656
registry: {

‎azure-ts-containerapps/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"dependencies": {
88
"@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"
1111
}
1212
}

‎classic-azure-ts-aks-keda/keda.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2016-2019, Pulumi Corporation. All rights reserved.
22

33
import * as azure from "@pulumi/azure";
4-
import * as docker from "@pulumi/docker";
4+
import * as docker from "@pulumi/docker-build";
55
import * as k8s from "@pulumi/kubernetes";
66
import * as pulumi from "@pulumi/pulumi";
77

@@ -87,7 +87,7 @@ export class KedaStorageQueueHandler extends pulumi.ComponentResource {
8787
const registry = args.service.registry;
8888

8989
// Deploy the docker image of the Function App
90-
const dockerImage = new docker.Image("image", {
90+
const dockerImage = new docker.BuildImage("image", {
9191
imageName: pulumi.interpolate`${registry.loginServer}/${args.queue.name}:v1.0.0`,
9292
build: {
9393
context: args.path,

‎classic-azure-ts-aks-keda/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"dependencies": {
88
"@pulumi/azure": "6.15.0",
99
"@pulumi/azuread": "6.1.0",
10-
"@pulumi/docker": "4.6.0",
1110
"@pulumi/kubernetes": "4.19.0",
1211
"@pulumi/pulumi": "3.145.0",
1312
"@pulumi/random": "4.16.8",
14-
"@pulumi/tls": "5.0.10"
13+
"@pulumi/tls": "5.0.10",
14+
"@pulumi/docker-build": "^0.0.8"
1515
},
1616
"license": "Apache-2.0"
1717
}

‎classic-azure-ts-cosmosapp-component/aci.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2016-2018, Pulumi Corporation. All rights reserved.
22

33
import * as azure from "@pulumi/azure";
4-
import * as docker from "@pulumi/docker";
4+
import * as docker from "@pulumi/docker-build";
55
import * as pulumi from "@pulumi/pulumi";
66
import { CosmosApp, GlobalContext, RegionalContext } from "./cosmosApp";
77

@@ -21,7 +21,7 @@ function buildContainerApp({ cosmosAccount, database, container, opts }: GlobalC
2121
sku: "Premium",
2222
}, opts);
2323

24-
const dockerImage = new docker.Image("node-app", {
24+
const dockerImage = new docker.BuildImage("node-app", {
2525
imageName: pulumi.interpolate`${registry.loginServer}/mynodeapp:v1.0.0`,
2626
build: {
2727
context: "./container",

‎classic-azure-ts-cosmosapp-component/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"dependencies": {
1111
"@azure/cosmos": "latest",
1212
"@pulumi/azure": "6.15.0",
13-
"@pulumi/docker": "4.6.0",
1413
"@pulumi/pulumi": "3.145.0",
15-
"@pulumi/random": "4.16.8"
14+
"@pulumi/random": "4.16.8",
15+
"@pulumi/docker-build": "^0.0.8"
1616
}
1717
}

‎docker-ts-multi-container-app/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2016-2021, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as pulumi from "@pulumi/pulumi";
55

66
// Set defaults for redis
@@ -30,7 +30,7 @@ const redisContainer = new docker.Container("redisContainer", {
3030
});
3131

3232
// Create image from local app
33-
const appImage = new docker.Image("appImage", {
33+
const appImage = new docker.BuildImage("appImage", {
3434
build: {
3535
context: "./app",
3636
},

‎docker-ts-multi-container-app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"@types/node": "10.17.60"
55
},
66
"dependencies": {
7-
"@pulumi/docker": "4.6.0",
8-
"@pulumi/pulumi": "3.145.0"
7+
"@pulumi/pulumi": "3.145.0",
8+
"@pulumi/docker-build": "^0.0.8"
99
}
1010
}

‎gcp-ts-cloudrun/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2016-2020, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as gcp from "@pulumi/gcp";
55
import * as pulumi from "@pulumi/pulumi";
66

@@ -46,7 +46,7 @@ export const helloUrl = helloService.statuses[0].url;
4646
// Build a Docker image from our sample Ruby app and put it to Google Container Registry.
4747
// Note: Run `gcloud auth configure-docker` in your command line to configure auth to GCR.
4848
const imageName = "ruby-app";
49-
const myImage = new docker.Image(imageName, {
49+
const myImage = new docker.BuildImage(imageName, {
5050
imageName: pulumi.interpolate`gcr.io/${gcp.config.project}/${imageName}:v1.0.0`,
5151
build: {
5252
context: "./app",

‎gcp-ts-cloudrun/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"@types/node": "12.20.55"
77
},
88
"dependencies": {
9-
"@pulumi/docker": "4.6.0",
109
"@pulumi/gcp": "8.13.1",
11-
"@pulumi/pulumi": "3.145.0"
10+
"@pulumi/pulumi": "3.145.0",
11+
"@pulumi/docker-build": "^0.0.8"
1212
}
1313
}

‎gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import * as pulumi from "@pulumi/pulumi";
44
import * as gcp from "@pulumi/gcp";
5-
import * as docker from "@pulumi/docker";
5+
import * as docker from "@pulumi/docker-build";
66

77
const location = gcp.config.region || "us-central1";
88

‎gcp-ts-docker-gcr-cloudrun/cloud-run-deploy/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"@types/node": "12.20.55"
55
},
66
"dependencies": {
7-
"@pulumi/docker": "4.6.0",
87
"@pulumi/gcp": "8.13.1",
9-
"@pulumi/pulumi": "3.145.0"
8+
"@pulumi/pulumi": "3.145.0",
9+
"@pulumi/docker-build": "^0.0.8"
1010
}
1111
}

‎gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2016-2020, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as gcp from "@pulumi/gcp";
55
import * as pulumi from "@pulumi/pulumi";
66

77
// Build and push image to gcr repository
88

99
const imageName = "ruby-app";
1010

11-
const myImage = new docker.Image(imageName, {
11+
const myImage = new docker.BuildImage(imageName, {
1212
imageName: pulumi.interpolate`gcr.io/${gcp.config.project}/${imageName}:latest`,
1313
build: {
1414
context: "./app",

‎gcp-ts-docker-gcr-cloudrun/docker-build-push-gcr/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"@types/node": "12.20.55"
55
},
66
"dependencies": {
7-
"@pulumi/docker": "4.6.0",
87
"@pulumi/gcp": "8.13.1",
9-
"@pulumi/pulumi": "3.145.0"
8+
"@pulumi/pulumi": "3.145.0",
9+
"@pulumi/docker-build": "^0.0.8"
1010
}
1111
}

‎gcp-ts-k8s-ruby-on-rails-postgresql/infra/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2016-2018, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as k8s from "@pulumi/kubernetes";
55
import * as pulumi from "@pulumi/pulumi";
66
import * as cluster from "./cluster";
77
import * as config from "./config";
88
import * as db from "./db";
99

1010
// Get the GCR repository for our app container, and build and publish the app image.
11-
const appImage = new docker.Image("rails-app", {
11+
const appImage = new docker.BuildImage("rails-app", {
1212
imageName: `${config.dockerUsername}/${pulumi.getProject()}_${pulumi.getStack()}`,
1313
build: "../app",
1414
registry: {

‎gcp-ts-k8s-ruby-on-rails-postgresql/infra/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"@types/node": "8.10.66"
55
},
66
"dependencies": {
7-
"@pulumi/docker": "4.6.0",
87
"@pulumi/gcp": "8.13.1",
98
"@pulumi/kubernetes": "4.19.0",
10-
"@pulumi/pulumi": "3.145.0"
9+
"@pulumi/pulumi": "3.145.0",
10+
"@pulumi/docker-build": "^0.0.8"
1111
}
1212
}

‎google-native-ts-k8s-python-postgresql/infra/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { readFileSync } from "fs";
2-
import * as docker from "@pulumi/docker";
2+
import * as docker from "@pulumi/docker-build";
33
import * as k8s from "@pulumi/kubernetes";
44
import * as pulumi from "@pulumi/pulumi";
55
import * as cluster from "./cluster";
@@ -18,7 +18,7 @@ const projectVersion = readFileSync("../app/VERSION.txt", "utf8").trim();
1818
// Make sure docker is configured to use docker registry by running
1919
// > gcloud auth configure-docker
2020
// before running pulumi up
21-
const appImage = new docker.Image(
21+
const appImage = new docker.BuildImage(
2222
"app",
2323
{
2424
imageName: pulumi.interpolate`us-docker.pkg.dev/${config.projectId}/${dockerRegistryId}/api:${projectVersion}-${gitHash}`,

‎google-native-ts-k8s-python-postgresql/infra/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"dependencies": {
3-
"@pulumi/docker": "4.6.0",
43
"@pulumi/gcp": "8.13.1",
54
"@pulumi/google-native": "0.32.0",
65
"@pulumi/kubernetes": "4.19.0",
76
"@pulumi/pulumi": "3.145.0",
8-
"@pulumi/random": "4.16.8"
7+
"@pulumi/random": "4.16.8",
8+
"@pulumi/docker-build": "^0.0.8"
99
},
1010
"devDependencies": {
1111
"@types/node": "17.0.45"

‎google-native-ts-k8s-ruby-on-rails-postgresql/infra/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2016-2021, Pulumi Corporation. All rights reserved.
22

3-
import * as docker from "@pulumi/docker";
3+
import * as docker from "@pulumi/docker-build";
44
import * as k8s from "@pulumi/kubernetes";
55
import * as pulumi from "@pulumi/pulumi";
66
import * as cluster from "./cluster";
@@ -11,7 +11,7 @@ import * as db from "./db";
1111
// Make sure docker is configured to use docker registry by running
1212
// > gcloud auth configure-docker
1313
// before running pulumi up
14-
const appImage = new docker.Image("rails-app", {
14+
const appImage = new docker.BuildImage("rails-app", {
1515
imageName: pulumi.interpolate`gcr.io/${config.project}/rails-app:latest`,
1616
build: {
1717
context: "../app",

‎google-native-ts-k8s-ruby-on-rails-postgresql/infra/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"@types/node": "8.10.66"
55
},
66
"dependencies": {
7-
"@pulumi/docker": "4.6.0",
87
"@pulumi/gcp": "8.13.1",
98
"@pulumi/google-native": "0.32.0",
109
"@pulumi/kubernetes": "4.19.0",
1110
"@pulumi/pulumi": "3.145.0",
12-
"@pulumi/random": "4.16.8"
11+
"@pulumi/random": "4.16.8",
12+
"@pulumi/docker-build": "^0.0.8"
1313
}
1414
}

0 commit comments

Comments
 (0)