Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to docker compose v2 #607

Closed
paralin opened this issue Jul 1, 2022 · 4 comments
Closed

Switch to docker compose v2 #607

paralin opened this issue Jul 1, 2022 · 4 comments
Labels

Comments

@paralin
Copy link
Collaborator

paralin commented Jul 1, 2022

V2 uses commands like docker compose as a CLI plugin instead of the old python based docker-compose. I think the CLI is compatible, otherwise.

@paralin
Copy link
Collaborator Author

paralin commented Jul 1, 2022

@stephenh it's a very minor change, appended it to #603

@paralin
Copy link
Collaborator Author

paralin commented Jul 1, 2022

diff --git a/package.json b/package.json
index 99ff356..99c73f6 100644
--- a/package.json
+++ b/package.json
@@ -12,17 +12,17 @@
     "build:test": "yarn proto2bin && yarn proto2pbjs && yarn bin2ts",
     "build:test:local": "yarn proto2bin:local && yarn proto2pbjs:local && yarn bin2ts:local",
     "prepare": "yarn build",
-    "proto2bin": "docker-compose run --rm protoc update-bins.sh",
-    "proto2bin-node": "docker-compose run --rm node update-bins.sh",
-    "proto2pbjs": "docker-compose run --rm protoc pbjs.sh",
-    "bin2ts": "docker-compose run --rm protoc codegen.sh",
+    "proto2bin": "docker compose run --rm protoc update-bins.sh",
+    "proto2bin-node": "docker compose run --rm node update-bins.sh",
+    "proto2pbjs": "docker compose run --rm protoc pbjs.sh",
+    "bin2ts": "docker compose run --rm protoc codegen.sh",
     "proto2bin:local": "integration/update-bins.sh",
     "proto2pbjs:local": "integration/pbjs.sh",
     "bin2ts:local": "integration/codegen.sh",
     "test": "yarn jest -c jest.config.js --maxWorkers=2",
     "prettier": "prettier --write {src,tests}/**/*.ts integration/*.ts",
     "prettier:check": "prettier --list-different {src,tests}/**/*.ts",
-    "setup:docker": "docker-compose build",
+    "setup:docker": "docker compose build",
     "watch": "ts-node integration/watch.ts"
   },
   "files": [

paralin added a commit to paralin/ts-proto that referenced this issue Jul 1, 2022
Updates to TypeScript 4.7.x (latest).

This requires an update to ts-proto-descriptors, to release:

 1. Release ts-proto-descriptors version 1.7.0.
 2. Update package.json with ts-proto-descriptors version.
 3. Publish ts-proto update.

Additionally, some other minor fixes:

 - Cast _unknownFields to any to fix build errors.
 - Update docker-compose to v2: uses plugin: "docker compose"

Fixes stephenh#607

Signed-off-by: Christian Stewart <christian@paral.in>
@stephenh
Copy link
Owner

stephenh commented Jul 1, 2022

Huh! I didn't know that about docker compose v2, thanks!

@stephenh
Copy link
Owner

stephenh commented Jul 1, 2022

🎉 This issue has been resolved in version 1.116.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants