paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

Merge pull request #3564 from lowjoel/fix-dockerode-types

Browse Source 
fix: Conflicting dockerode version specifications
This commit is contained in:
Fredrik Adelöw
2020-12-04 13:39:12 +01:00
committed by GitHub
parent cc5eef1ec4 5d88473d9e
commit 894136a440
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/package.json
+2 -2
View File
@@ -34,7 +34,7 @@
"@gitbeaker/node": "^25.2.0",
"@octokit/rest": "^18.0.0",
"azure-devops-node-api": "^10.1.1",
"dockerode": "^3.2.0",
"dockerode": "^3.2.1",
"example-app": "^0.2.5",
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
@@ -46,7 +46,7 @@
},
"devDependencies": {
"@backstage/cli": "^0.4.0",
"@types/dockerode": "^2.5.32",
"@types/dockerode": "^3.2.1",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
"@types/helmet": "^0.0.48"
packages/create-app/templates/default-app/packages/backend/package.json.hbs
+2 -2
View File
@@ -29,7 +29,7 @@
"@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
"@octokit/rest": "^18.0.0",
"@gitbeaker/node": "^25.2.0",
"dockerode": "^3.2.0",
"dockerode": "^3.2.1",
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
"knex": "^0.21.6",
@@ -43,7 +43,7 @@
},
"devDependencies": {
"@backstage/cli": "^{{version '@backstage/cli'}}",
"@types/dockerode": "^2.5.32",
"@types/dockerode": "^3.2.1",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
"@types/helmet": "^0.0.47"