From 016c7e1e4909fdffc8696138fc7a899173c15dac Mon Sep 17 00:00:00 2001 From: Daniel Bradley Date: Wed, 22 Nov 2023 10:29:51 +0000 Subject: [PATCH] Upgrade docker to 4.5.0 (#1163) - Add missing makefile dependency. Codegen reads dependencies from package.json to generate the schema. --- Makefile | 2 +- awsx/package.json | 2 +- awsx/yarn.lock | 8 ++++---- schema.json | 6 +++--- sdk/java/build.gradle | 2 +- sdk/nodejs/package.json | 2 +- sdk/python/setup.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index bf186a94b..92270609d 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ all:: lint lint_classic provider build_sdks test_provider bin/${CODEGEN}: ${CODEGEN_SRC} cd schemagen && go build -o $(WORKING_DIR)/bin/${CODEGEN} $(WORKING_DIR)/schemagen/cmd/$(CODEGEN) -.make/schema: bin/${CODEGEN} +.make/schema: bin/${CODEGEN} awsx/package.json bin/${CODEGEN} schema $(WORKING_DIR) @touch $@ diff --git a/awsx/package.json b/awsx/package.json index 33fc0a782..e288d8c1e 100644 --- a/awsx/package.json +++ b/awsx/package.json @@ -23,7 +23,7 @@ "//": "Pulumi sub-provider dependencies must be pinned at an exact version because we extract this value to generate the correct dependency in the schema", "dependencies": { "@pulumi/aws": "6.9.0", - "@pulumi/docker": "4.4.4", + "@pulumi/docker": "4.5.0", "@pulumi/pulumi": "^3.91.1", "@types/aws-lambda": "^8.10.23", "docker-classic": "npm:@pulumi/docker@3.6.1", diff --git a/awsx/yarn.lock b/awsx/yarn.lock index bdc43ca61..87495f6a7 100644 --- a/awsx/yarn.lock +++ b/awsx/yarn.lock @@ -1530,10 +1530,10 @@ read-package-tree "^5.2.1" resolve "^1.7.1" -"@pulumi/docker@4.4.4": - version "4.4.4" - resolved "https://registry.yarnpkg.com/@pulumi/docker/-/docker-4.4.4.tgz#1e412663311d36c8aeba301587e2385a201a9364" - integrity sha512-CuW5UAI+mZWJqD3ZKEv74ReWu/jCpoJKyXpjtp3m4I+bWoOoOfg7jUGoJnwLODQPnrmlawOviNa0TzMR5WdXaQ== +"@pulumi/docker@4.5.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/@pulumi/docker/-/docker-4.5.0.tgz#41598c9f2ba4497f638ead248ca31d435be59abe" + integrity sha512-DOiczZK1cF4NGlEWzacPLjGcoPKXHXISoqq4KqCO97YW28rZSu6LOdveQ8tLaUHGeyWQ+CS3PT45caSxHAbzbw== dependencies: "@pulumi/pulumi" "^3.0.0" semver "^5.4.0" diff --git a/schema.json b/schema.json index 41b0659cc..79015269b 100644 --- a/schema.json +++ b/schema.json @@ -33,14 +33,14 @@ "java": { "dependencies": { "com.pulumi:aws": "6.9.0", - "com.pulumi:docker": "4.4.4" + "com.pulumi:docker": "4.5.0" } }, "nodejs": { "dependencies": { "@aws-sdk/client-ecs": "^3.405.0", "@pulumi/aws": "^6.9.0", - "@pulumi/docker": "^4.4.4", + "@pulumi/docker": "^4.5.0", "@pulumi/pulumi": "^3.0.0", "@types/aws-lambda": "^8.10.23", "aws-sdk": "^2.1450.0", @@ -59,7 +59,7 @@ "requires": { "pulumi": "\u003e=3.91.1,\u003c4.0.0", "pulumi-aws": "\u003e=6.0.4,\u003c7.0.0", - "pulumi-docker": "\u003e=4.4.4,\u003c5.0.0" + "pulumi-docker": "\u003e=4.5.0,\u003c5.0.0" }, "usesIOClasses": true } diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index e9529c14e..7ecbd1404 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson:2.8.9") implementation("com.pulumi:aws:6.9.0") - implementation("com.pulumi:docker:4.4.4") + implementation("com.pulumi:docker:4.5.0") implementation("com.pulumi:pulumi:0.9.7") } diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index 157fa5ba4..052ba180b 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -17,7 +17,7 @@ "dependencies": { "@aws-sdk/client-ecs": "^3.405.0", "@pulumi/aws": "^6.9.0", - "@pulumi/docker": "^4.4.4", + "@pulumi/docker": "^4.5.0", "@pulumi/pulumi": "^3.0.0", "@types/aws-lambda": "^8.10.23", "aws-sdk": "^2.1450.0", diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 5d7bfed20..df708d3db 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -40,7 +40,7 @@ def readme(): 'parver>=0.2.1', 'pulumi>=3.91.1,<4.0.0', 'pulumi-aws>=6.0.4,<7.0.0', - 'pulumi-docker>=4.4.4,<5.0.0', + 'pulumi-docker>=4.5.0,<5.0.0', 'semver>=2.8.1' ], zip_safe=False)