Skip to content

Commit

Permalink
Upgrade docker to 4.5.0 (#1163)
Browse files Browse the repository at this point in the history
- Add missing makefile dependency. Codegen reads dependencies from package.json to generate the schema.
  • Loading branch information
danielrbradley committed Nov 22, 2023
1 parent fc171f7 commit 016c7e1
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

Expand Down
2 changes: 1 addition & 1 deletion awsx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions awsx/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 016c7e1

Please sign in to comment.