@mikeyt23/node-cli-utils 2.0.5 → 2.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +6 -6
- package/README.md +11 -10
- package/dist/cjs/DependencyChecker.d.ts.map +1 -1
- package/dist/cjs/DependencyChecker.js +3 -2
- package/dist/cjs/NodeCliUtilsConfig.d.ts +3 -7
- package/dist/cjs/NodeCliUtilsConfig.d.ts.map +1 -1
- package/dist/cjs/NodeCliUtilsConfig.js +7 -10
- package/dist/cjs/certUtils.js +22 -22
- package/dist/cjs/dbMigrationUtils.js +21 -21
- package/dist/cjs/dockerUtils.d.ts +164 -0
- package/dist/cjs/dockerUtils.d.ts.map +1 -0
- package/dist/cjs/dockerUtils.js +299 -0
- package/dist/cjs/generalUtils.d.ts +55 -110
- package/dist/cjs/generalUtils.d.ts.map +1 -1
- package/dist/cjs/generalUtils.js +63 -196
- package/dist/cjs/generalUtilsInternal.js +2 -2
- package/dist/cjs/package.json +5 -5
- package/dist/esm/DependencyChecker.d.ts.map +1 -1
- package/dist/esm/DependencyChecker.js +3 -2
- package/dist/esm/NodeCliUtilsConfig.d.ts +3 -7
- package/dist/esm/NodeCliUtilsConfig.d.ts.map +1 -1
- package/dist/esm/NodeCliUtilsConfig.js +7 -10
- package/dist/esm/certUtils.js +22 -22
- package/dist/esm/dbMigrationUtils.js +21 -21
- package/dist/esm/dockerUtils.d.ts +164 -0
- package/dist/esm/dockerUtils.d.ts.map +1 -0
- package/dist/esm/dockerUtils.js +281 -0
- package/dist/esm/generalUtils.d.ts +55 -110
- package/dist/esm/generalUtils.d.ts.map +1 -1
- package/dist/esm/generalUtils.js +60 -190
- package/dist/esm/generalUtilsInternal.js +2 -2
- package/package.json +25 -2
package/dist/esm/certUtils.js
CHANGED
|
@@ -187,13 +187,13 @@ export async function winGetPfxInfo(pfxPath) {
|
|
|
187
187
|
* Does not actually do anything - just outputs the manual instructions for installing a cert for use by chrome on linux.
|
|
188
188
|
*/
|
|
189
189
|
export function linuxInstallCert() {
|
|
190
|
-
const instructions = `Automated linux cert install not supported (chrome does not use system certs without significant extra configuration).
|
|
191
|
-
Manual Instructions:
|
|
192
|
-
- In Chrome, go to chrome://settings/certificates
|
|
193
|
-
- Select Authorities -> import
|
|
194
|
-
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl function)
|
|
195
|
-
- Check box for "Trust certificate for identifying websites"
|
|
196
|
-
- Click OK
|
|
190
|
+
const instructions = `Automated linux cert install not supported (chrome does not use system certs without significant extra configuration).
|
|
191
|
+
Manual Instructions:
|
|
192
|
+
- In Chrome, go to chrome://settings/certificates
|
|
193
|
+
- Select Authorities -> import
|
|
194
|
+
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl function)
|
|
195
|
+
- Check box for "Trust certificate for identifying websites"
|
|
196
|
+
- Click OK
|
|
197
197
|
- Reload site`;
|
|
198
198
|
console.log(instructions);
|
|
199
199
|
}
|
|
@@ -253,20 +253,20 @@ function getRequiresElevatedPermissionsMessage(isInstall = true) {
|
|
|
253
253
|
}
|
|
254
254
|
// Newer cert requirements force the need for "extension info" with DNS and IP info, but openssl v1.x doesn't support that with the
|
|
255
255
|
// CLI option -addext, so we're using a san.cnf file instead and passing this into the CLI command with the -config option.
|
|
256
|
-
const sanCnfTemplate = `[req]
|
|
257
|
-
distinguished_name=req
|
|
258
|
-
x509_extensions = v3_req
|
|
259
|
-
prompt = no
|
|
260
|
-
|
|
261
|
-
[req_distinguished_name]
|
|
262
|
-
CN = {{url}}
|
|
263
|
-
|
|
264
|
-
[v3_req]
|
|
265
|
-
subjectAltName = @alt_names
|
|
266
|
-
|
|
267
|
-
[alt_names]
|
|
268
|
-
DNS.1 = {{url}}
|
|
269
|
-
IP.1 = 127.0.0.1
|
|
270
|
-
|
|
256
|
+
const sanCnfTemplate = `[req]
|
|
257
|
+
distinguished_name=req
|
|
258
|
+
x509_extensions = v3_req
|
|
259
|
+
prompt = no
|
|
260
|
+
|
|
261
|
+
[req_distinguished_name]
|
|
262
|
+
CN = {{url}}
|
|
263
|
+
|
|
264
|
+
[v3_req]
|
|
265
|
+
subjectAltName = @alt_names
|
|
266
|
+
|
|
267
|
+
[alt_names]
|
|
268
|
+
DNS.1 = {{url}}
|
|
269
|
+
IP.1 = 127.0.0.1
|
|
270
|
+
|
|
271
271
|
`;
|
|
272
272
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certUtils.js","sourceRoot":"","sources":["../../src/certUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,GAAG,MAAM,kBAAkB,CAAA;AAClC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EACL,KAAK,EAGL,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,iBAAiB,EACjB,KAAK,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,SAAS,EACV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAejC,MAAM,qBAAqB,GAAmB;IAC5C,cAAc,EAAE,KAAK;IACrB,gBAAgB,EAAE,KAAK;IACvB,6BAA6B,EAAE,IAAI;IACnC,UAAU,EAAE,IAAI;CACjB,CAAA;AAWD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAW,EAAE,OAAsC;IAC/F,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACzB,uBAAuB,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;IAE7B,MAAM,aAAa,GAAwB,EAAE,GAAG,qBAAqB,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAA;IAE9G,MAAM,SAAS,GAAmC,EAAE,GAAG,EAAE,aAAa,CAAC,eAAe,EAAE,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;IAElJ,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,kCAAkC,CAAC,CAAA;IAEzE,IAAI,eAAe,GAAW,EAAE,CAAA;IAChC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAA;QACjD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,KAAK,CAAC,uCAAuC,CAAC,CAAA;SACrD;QACD,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,qBAAqB,WAAW,EAAE,CAAC,CAAA;KAC1E;SAAM,IAAI,KAAK,EAAE;QAChB,MAAM,oBAAoB,GAAG,kBAAkB,EAAE,CAAA;QACjD,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,KAAK,CAAC,sDAAsD,CAAC,CAAA;SACpE;QACD,eAAe,GAAG,GAAG,kBAAkB,EAAE,cAAc,CAAA;QACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;YACnC,MAAM,KAAK,CAAC,4DAA4D,eAAe,EAAE,CAAC,CAAA;SAC3F;aAAM;YACL,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,qBAAqB,eAAe,EAAE,CAAC,CAAA;SAC9E;KACF;IAED,eAAe,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,GAAG,GAAG,MAAM,CAAA;IAC5B,MAAM,OAAO,GAAG,GAAG,GAAG,MAAM,CAAA;IAC5B,MAAM,OAAO,GAAG,GAAG,GAAG,MAAM,CAAA;IAC5B,MAAM,UAAU,GAAG,GAAG,GAAG,MAAM,CAAA;IAE/B,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;IAC5D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;QAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC3B,MAAM,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,SAAS,QAAQ,sEAAsE,aAAa,CAAC,eAAe,yCAAyC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAClN;KACF;IAED,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,WAAW,UAAU,oCAAoC,CAAC,CAAA;IAChG,MAAM,cAAc,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;IACvE,MAAM,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IAE/C,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,+BAA+B,OAAO,EAAE,CAAC,CAAA;IAC/E,MAAM,gBAAgB,GAAG,gEAAgE,OAAO,SAAS,OAAO,cAAc,GAAG,YAAY,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACpK,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAA;IACnD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;IACnE,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,CAAA;IACtE,MAAM,gBAAgB,GAAG,4CAA4C,OAAO,mBAAmB,OAAO,QAAQ,OAAO,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClJ,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;IAC/D,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IAEjE,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,UAAU,iCAAiC,OAAO,EAAE,CAAC,CAAA;IAE9F,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,OAAiC;IACrF,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,KAAK,CAAC,6CAA6C,CAAC,CAAA;KAC3D;IACD,eAAe,CAAC,OAAO,CAAC,CAAA;IAExB,MAAM,aAAa,GAAG,EAAE,GAAG,qBAAqB,EAAE,GAAG,OAAO,EAAE,CAAA;IAE9D,KAAK,CAAC,aAAa,CAAC,6BAA6B,EAAE,qCAAqC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/F,IAAI,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE;QACxD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;QAC7C,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,GAAG,KAAK,CAAC,OAAO,iBAAiB,OAAO,mBAAmB,QAAQ,CAAC,OAAO,iHAAiH,CAAC,CAAA;QACnO,OAAM;KACP;IAED,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,oBAAoB,OAAO,GAAG,CAAC,CAAA;IAErE,MAAM,aAAa,GAAG,qBAAqB,CAAC,oCAAoC,OAAO,gDAAgD,CAAC,CAAA;IACxI,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;IAE1H,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,UAAU,iCAAiC,OAAO,EAAE,CAAC,CAAA;AAChG,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,UAA2C,EAAE,OAAiC;IACrH,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;KACnE;IAED,MAAM,aAAa,GAAG,EAAE,GAAG,qBAAqB,EAAE,GAAG,OAAO,EAAE,CAAA;IAE9D,IAAI,aAAa,CAAA;IAEjB,4FAA4F;IAC5F,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QACpC,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,EAAE,CAAA;QAC9E,aAAa,GAAG,qBAAqB,CAAC,wFAAwF,OAAO,6BAA6B,CAAC,CAAA;KACpK;SAAM,IAAI,SAAS,IAAI,UAAU,EAAE;QAClC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACnC,aAAa,GAAG,qBAAqB,CAAC,sHAAsH,UAAU,CAAC,OAAO,sCAAsC,CAAC,CAAA;KACtN;IAED,MAAM,SAAS,GAAG,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,OAAO,EAAE,CAAA;IAC9G,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,yBAAyB,SAAS,uBAAuB,CAAC,CAAA;IAEhG,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAE/E,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,MAAM,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAElD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,wFAAwF,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;KACzH;IAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,GAAG,CAAA;AAChC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAA0B,EAAE,OAAiC;IAClG,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;KACjE;IAED,MAAM,aAAa,GAAG,EAAE,GAAG,qBAAqB,EAAE,GAAG,OAAO,EAAE,CAAA;IAE9D,KAAK,CAAC,aAAa,CAAC,6BAA6B,EAAE,qCAAqC,CAAC,KAAK,CAAC,CAAC,CAAA;IAEhG,IAAI,aAAa,CAAA;IAEjB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QACpC,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,aAAa,GAAG,qBAAqB,CAAC,+EAA+E,UAAU,mBAAmB,CAAC,CAAA;KACpJ;SAAM,IAAI,YAAY,IAAI,UAAU,EAAE;QACrC,gBAAgB,CAAC,YAAY,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;QACrD,aAAa,GAAG,qBAAqB,CAAC,+EAA+E,UAAU,CAAC,UAAU,mBAAmB,CAAC,CAAA;KAC/J;SAAM,IAAI,SAAS,IAAI,UAAU,EAAE;QAClC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACnC,aAAa,GAAG,qBAAqB,CAAC,gDAAgD,UAAU,CAAC,OAAO,uHAAuH,CAAC,CAAA;KACjO;IAED,MAAM,SAAS,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACjG,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,qBAAqB,SAAS,EAAE,CAAC,CAAA;IAEvE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;IAE1H,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,UAAU,gCAAgC,CAAC,CAAA;AACtF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAe;IACjD,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;KAC9D;IACD,eAAe,CAAC,OAAO,CAAC,CAAA;IAExB,MAAM,aAAa,GAAG,qBAAqB,CAAC,iCAAiC,OAAO,kFAAkF,OAAO,sBAAsB,CAAC,CAAA;IACpM,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAE/E,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAE/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEnC,MAAM,QAAQ,GAAa;QACzB,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,MAAM,YAAY,GAAG;;;;;;;cAOT,CAAA;IACZ,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,uBAAuB,CAAC,GAAW,EAAE,OAAO,GAAG,KAAK;IAC3D,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACrB,MAAM,KAAK,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAA;KACpD;IACD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACrB,MAAM,KAAK,CAAC,GAAG,OAAO,qCAAqC,CAAC,CAAA;KAC7D;IACD,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,KAAK,CAAC,GAAG,OAAO,iCAAiC,CAAC,CAAA;KACzD;AACH,CAAC;AAED,SAAS,kBAAkB;IACzB,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;IACnE,IAAI,UAAU,CAAC,KAAK,EAAE;QACpB,MAAM,KAAK,CAAC,oDAAoD,CAAC,CAAA;KAClE;IACD,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5E,MAAM,IAAI,KAAK,CAAC,gEAAgE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;KACrG;IACD,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;AAClC,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAW;IACxC,OAAO,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;AAChD,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC/E,MAAM,IAAI,KAAK,CAAC,8HAA8H,OAAO,OAAO,CAAC,CAAA;KAC9J;IACD,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;AACtC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY,EAAE,KAAa;IACnD,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,4DAA4D,CAAC,CAAA;KAC3G;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAmB;IAClD,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;QACrB,mFAAmF;QACnF,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;SAC5C;QACD,MAAM,KAAK,CAAC,yCAAyC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;KACpE;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;KAC9C;IACD,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACpC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;AACtC,CAAC;AAED,SAAS,qCAAqC,CAAC,SAAS,GAAG,IAAI;IAC7D,OAAO,GAAG,KAAK,CAAC,IAAI,eAAe,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,wDAAwD,CAAA;AAClH,CAAC;AAED,mIAAmI;AACnI,2HAA2H;AAC3H,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;CAetB,CAAA"}
|
|
@@ -159,26 +159,26 @@ async function writeEmptySqlFileIfNotExists(scriptPath, scriptType) {
|
|
|
159
159
|
}
|
|
160
160
|
const contextNamePlaceholder = '{{context_name}}';
|
|
161
161
|
const migrationNamePlaceholder = '{{migration_name}}';
|
|
162
|
-
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
163
|
-
using MikeyT.DbMigrations;
|
|
164
|
-
|
|
165
|
-
#nullable disable
|
|
166
|
-
|
|
167
|
-
namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
168
|
-
{
|
|
169
|
-
public partial class ${migrationNamePlaceholder} : Migration
|
|
170
|
-
{
|
|
171
|
-
protected override void Up(MigrationBuilder migrationBuilder)
|
|
172
|
-
{
|
|
173
|
-
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}.sql");
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
protected override void Down(MigrationBuilder migrationBuilder)
|
|
177
|
-
{
|
|
178
|
-
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}_Down.sql");
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
|
|
162
|
+
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
163
|
+
using MikeyT.DbMigrations;
|
|
164
|
+
|
|
165
|
+
#nullable disable
|
|
166
|
+
|
|
167
|
+
namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
168
|
+
{
|
|
169
|
+
public partial class ${migrationNamePlaceholder} : Migration
|
|
170
|
+
{
|
|
171
|
+
protected override void Up(MigrationBuilder migrationBuilder)
|
|
172
|
+
{
|
|
173
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}.sql");
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
protected override void Down(MigrationBuilder migrationBuilder)
|
|
177
|
+
{
|
|
178
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}_Down.sql");
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
183
|
`;
|
|
184
184
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { SimpleSpawnResult } from './generalUtils.js';
|
|
2
|
+
/**
|
|
3
|
+
* Type guard for command passed to {@link spawnDockerCompose}.
|
|
4
|
+
*/
|
|
5
|
+
export type DockerComposeCommand = 'build' | 'config' | 'cp' | 'create' | 'down' | 'events' | 'exec' | 'images' | 'kill' | 'logs' | 'ls' | 'pause' | 'port' | 'ps' | 'pull' | 'push' | 'restart' | 'rm' | 'run' | 'start' | 'stop' | 'top' | 'unpause' | 'up' | 'version';
|
|
6
|
+
/**
|
|
7
|
+
* Check if the string is a valid docker compose project name:
|
|
8
|
+
*
|
|
9
|
+
* - Must contain only lowercase letters, digits, dashes and underscores
|
|
10
|
+
* - Must start with a lowercase letter or digit
|
|
11
|
+
*
|
|
12
|
+
* See https://docs.docker.com/compose/environment-variables/envvars/#compose_project_name.
|
|
13
|
+
* @param projectName The string to validate
|
|
14
|
+
* @returns `true` if the string is a valid docker compose project name, `false` otherwise
|
|
15
|
+
*/
|
|
16
|
+
export declare function isValidDockerComposeProjectName(projectName: string): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Check if the string is a valid docker container name:
|
|
19
|
+
*
|
|
20
|
+
* - Must start with a letter or digit
|
|
21
|
+
* - Contain only letters, digits, underscores and periods
|
|
22
|
+
* - Must not end with a period
|
|
23
|
+
* @param containerName The docker container name to validate.
|
|
24
|
+
* @returns `true` if valid, `false otherwise
|
|
25
|
+
*/
|
|
26
|
+
export declare function isValidDockerContainerName(containerName: string): boolean;
|
|
27
|
+
/**
|
|
28
|
+
* Options for {@link spawnDockerCompose}.
|
|
29
|
+
* @param projectName
|
|
30
|
+
* Note that there are other better options such as using the environment variable `COMPOSE_PROJECT_NAME`. See https://docs.docker.com/compose/environment-variables/envvars/#compose_project_name.
|
|
31
|
+
* @param attached Default: false. All commands that support the detached option wil use it unless attached is specified as true (-d support: exec, logs, ps, restart, run, start, stop, up)
|
|
32
|
+
* @param useDockerComposeFileDirectoryAsCwd Default: false. If true, the docker compose command will be run in the directory containing the docker compose file.
|
|
33
|
+
*/
|
|
34
|
+
export interface DockerComposeOptions {
|
|
35
|
+
/** Additional arguments to pass to the docker-compose command. */
|
|
36
|
+
args: string[];
|
|
37
|
+
/**
|
|
38
|
+
* Defaults to `false`. Controls whether or not the `--detach` option is passed. Note that this only applies to
|
|
39
|
+
* some commands (exec, logs, ps, restart, run, start, stop, up).
|
|
40
|
+
*/
|
|
41
|
+
attached: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* If not provided, it will default to using the directory that the docker-compose.yml is located in.
|
|
44
|
+
* Specifies what current working directory to use with the spawn command.
|
|
45
|
+
*
|
|
46
|
+
* **Important:**: this only affects the current working directory of the spawned process itself. The docker command will still only pull in env values from a `.env`
|
|
47
|
+
* file in the same directory as the docker-compose.yml, NOT the cwd passed here. If a different `.env` file path is needed, use the {@link altEnvFilePath} option. If
|
|
48
|
+
* you use the {@link altEnvFilePath} option with a relative path, ensure that it is relative to the current working directory passed with this option.
|
|
49
|
+
*/
|
|
50
|
+
cwd?: string;
|
|
51
|
+
/**
|
|
52
|
+
* Optional. If provided, projectName will be passed as the `--project-name` param to `docker compose` so that generated containers will use it as a prefix
|
|
53
|
+
* instead of the default, which is the directory name where the docker-compose.yml is located.
|
|
54
|
+
*
|
|
55
|
+
* Alternate approaches for setting the docker compose project name:
|
|
56
|
+
*
|
|
57
|
+
* - Locate your docker-compose.yml file in the root of your project so that docker will use that directory name for prefixing generated containers
|
|
58
|
+
* - OR, locate your docker-compose.yml in a sub-directory named appropriately for use as a prefix for generated containers
|
|
59
|
+
* - OR, put a `.env` file in the same directory as your docker-compose.yml
|
|
60
|
+
* with the entry `COMPOSE_PROJECT_NAME=your-project-name`
|
|
61
|
+
*
|
|
62
|
+
* Additional note on docker compose project names form the official docker compose docs: "Project names must contain only lowercase letters, decimal digits,
|
|
63
|
+
* dashes, and underscores, and must begin with a lowercase letter or decimal digit". See https://docs.docker.com/compose/environment-variables/envvars/#compose_project_name.
|
|
64
|
+
*
|
|
65
|
+
*/
|
|
66
|
+
projectName?: string;
|
|
67
|
+
/**
|
|
68
|
+
* Optional. If provided, profile is passed to docker compose along with `--profile` param. Must match this regex: `[a-zA-Z0-9][a-zA-Z0-9_.-]+`.
|
|
69
|
+
*
|
|
70
|
+
* See https://docs.docker.com/compose/profiles/.
|
|
71
|
+
*/
|
|
72
|
+
profile?: string;
|
|
73
|
+
/**
|
|
74
|
+
* The option `useWslPrefix` set to `true` can be used If Docker Desktop is not installed on Windows and docker commands need to execute via wsl.
|
|
75
|
+
*/
|
|
76
|
+
useWslPrefix?: boolean;
|
|
77
|
+
/**
|
|
78
|
+
* Specify an alternative env file. This is useful since docker will normally only use a `.env` file in the same directory as the docker-compose.yml file,
|
|
79
|
+
* regardless of the current working directory of the running command. This path will be passed to docker compose using the `--env-file` option.
|
|
80
|
+
*
|
|
81
|
+
* **Important:** if using a relative path, be sure pass the appropriate value for {@link cwd} to this method so that the relative path can correctly be resolved.
|
|
82
|
+
*/
|
|
83
|
+
altEnvFilePath?: string;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* For docker compose commands, see https://docs.docker.com/compose/reference/. For available options for this wrapper function, see {@link DockerComposeOptions}.
|
|
87
|
+
*
|
|
88
|
+
* The current working directory will be the directory of the {@link dockerComposePath} unless specified in the options. This ensures relative paths in the
|
|
89
|
+
* docker compose file will be relative to itself by default.
|
|
90
|
+
*
|
|
91
|
+
* See {@link DockerComposeOptions.projectName} for info on where to locate your docker compose file and how to specify the docker project name.
|
|
92
|
+
* @param dockerComposePath Path to docker-compose.yml
|
|
93
|
+
* @param dockerComposeCommand The docker-compose command to run
|
|
94
|
+
* @param options {@link DockerComposeOptions} to use, including additional arguments to pass to the docker compose command and the project name
|
|
95
|
+
*/
|
|
96
|
+
export declare function spawnDockerCompose(dockerComposePath: string, dockerComposeCommand: DockerComposeCommand, options?: Partial<DockerComposeOptions>): Promise<void>;
|
|
97
|
+
/**
|
|
98
|
+
* Similar to {@link simpleSpawnAsync} but meant for `docker` calls only. Determines whether to run `docker` or `wsl docker` based
|
|
99
|
+
* on platform being windows and config setting `useWslPrefixForDockerCommands`.
|
|
100
|
+
* @param args The args to be passed to the docker command.
|
|
101
|
+
*/
|
|
102
|
+
export declare function simpleSpawnDockerAsync(args: string[]): Promise<SimpleSpawnResult>;
|
|
103
|
+
/**
|
|
104
|
+
* Uses {@link which} to determine if docker is installed. If the `which` call doesn't find docker and the platform
|
|
105
|
+
* is Windows, then this will check the output of `wsl docker --version` to see if just the engine is installed.
|
|
106
|
+
* @returns `true` if docker is installed, `false` otherwise
|
|
107
|
+
*/
|
|
108
|
+
export declare function isDockerInstalled(): Promise<boolean>;
|
|
109
|
+
/**
|
|
110
|
+
* Runs the `docker info` command and looks for "error during connect" in the output to determine if docker is running. If you
|
|
111
|
+
* want to check if docker is installed, use {@link isDockerInstalled}.
|
|
112
|
+
* @returns `true` if docker is installed and running, `false` otherwise
|
|
113
|
+
*/
|
|
114
|
+
export declare function isDockerRunning(): Promise<boolean>;
|
|
115
|
+
/**
|
|
116
|
+
* Attempt to start the docker service if it isn't running. Whether it's running is determined by a call to {@link isDockerRunning}.
|
|
117
|
+
*
|
|
118
|
+
* Notes on docker startup command:
|
|
119
|
+
* - May require entering a password
|
|
120
|
+
* - On Windows with Docker Desktop and from within powershell or cmd it will run in powershell: `Start-Process "C:\Program Files\Docker\Docker\Docker Desktop.exe" -NoNewWindow`
|
|
121
|
+
* - On Windows without Docker Desktop from within powershell or cmd it will run: `sudo service docker start`
|
|
122
|
+
* - On Linux (including WSL) it will run: `sudo systemctl start docker`
|
|
123
|
+
* - Not currently supported on Mac
|
|
124
|
+
* - If you're on Windows and have Docker Desktop but it is stopped and you're in a WSL shell, docker will appear as if it's not installed and this method will throw
|
|
125
|
+
*
|
|
126
|
+
* @throws An {@link Error} If docker is not detected on the system.
|
|
127
|
+
* @throws An {@link Error} if docker is detected as installed and not running but the OS is Mac.
|
|
128
|
+
*/
|
|
129
|
+
export declare function ensureDockerRunning(): Promise<void>;
|
|
130
|
+
/**
|
|
131
|
+
* The name of a docker volume to delete. Respects the config value `useWslPrefixForDockerCommands`.
|
|
132
|
+
* @param volumeName The name of the docker volume to delete.
|
|
133
|
+
* @throws An {@link ExtendedError} if the volume does not exist or the volume is in use.
|
|
134
|
+
*/
|
|
135
|
+
export declare function deleteDockerComposeVolume(volumeName: string): Promise<void>;
|
|
136
|
+
/**
|
|
137
|
+
* This function will take the volume name as you defined it in `docker-compose.yml` and try getting the actual volume name that docker
|
|
138
|
+
* compose will use. This is needed because docker compose will prefix the volume name with the compose project name (directory name or env
|
|
139
|
+
* `COMPOSE_PROJECT_NAME` or `-p` passed to docker compose commands).
|
|
140
|
+
*
|
|
141
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
142
|
+
* @param volumeName The volume name as defined in the `docker-compose.yml` file.
|
|
143
|
+
* @returns The full name of the docker-compose-actualized docker volume.
|
|
144
|
+
*/
|
|
145
|
+
export declare function getDockerComposeVolumeName(volumeName: string): Promise<string | undefined>;
|
|
146
|
+
/**
|
|
147
|
+
* Check if a docker volume exists based on inclusion of the specified `volumeName` in any of the output lines of `docker volume ls`.
|
|
148
|
+
*
|
|
149
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
150
|
+
* @param volumeName The docker volume name to check.
|
|
151
|
+
* @returns `true` if the docker volume exists, otherwise `false`.
|
|
152
|
+
*/
|
|
153
|
+
export declare function dockerVolumeExists(volumeName: string): Promise<boolean>;
|
|
154
|
+
/**
|
|
155
|
+
* This will attempt to delete a docker volume using the `docker volume rm` command.
|
|
156
|
+
*
|
|
157
|
+
* **Warning: ** there will be no prompt or confirmation before attempting to delete the volume.
|
|
158
|
+
*
|
|
159
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
160
|
+
* @param volumeName The name of the docker volume to delete.
|
|
161
|
+
* @throws An {@link Error} if the volume doesn't exist or is in use.
|
|
162
|
+
*/
|
|
163
|
+
export declare function deleteDockerVolume(volumeName: string): Promise<void>;
|
|
164
|
+
//# sourceMappingURL=dockerUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dockerUtils.d.ts","sourceRoot":"","sources":["../../src/dockerUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,iBAAiB,EAA8L,MAAM,mBAAmB,CAAA;AAGhQ;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,CAAA;AAIzQ;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAU5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,MAAM,WAE/D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,kEAAkE;IAClE,IAAI,EAAE,MAAM,EAAE,CAAA;IAEd;;;OAGG;IACH,QAAQ,EAAE,OAAO,CAAA;IAEjB;;;;;;;MAOE;IACF,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IAEtB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgFtK;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAIvF;AAED;;;;EAIE;AACF,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAS1D;AAED;;;;GAIG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CASxD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CA8CzD;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBjF;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAIhG;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7E;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E"}
|
|
@@ -0,0 +1,281 @@
|
|
|
1
|
+
import { execSync } from 'child_process';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { config } from './NodeCliUtilsConfig.js';
|
|
5
|
+
import { ExtendedError, getNormalizedError, getPowershellHackArgs, isPlatformLinux, isPlatformWindows, log, requireString, requireValidPath, simpleSpawnAsync, spawnAsync, toWslPath, trace, which, withRetryAsync } from './generalUtils.js';
|
|
6
|
+
import { spawnAsyncInternal, throwIfDockerNotReady } from './generalUtilsInternal.js';
|
|
7
|
+
const dockerComposeCommandsThatSupportDetached = ['exec', 'logs', 'ps', 'restart', 'run', 'start', 'stop', 'up'];
|
|
8
|
+
/**
|
|
9
|
+
* Check if the string is a valid docker compose project name:
|
|
10
|
+
*
|
|
11
|
+
* - Must contain only lowercase letters, digits, dashes and underscores
|
|
12
|
+
* - Must start with a lowercase letter or digit
|
|
13
|
+
*
|
|
14
|
+
* See https://docs.docker.com/compose/environment-variables/envvars/#compose_project_name.
|
|
15
|
+
* @param projectName The string to validate
|
|
16
|
+
* @returns `true` if the string is a valid docker compose project name, `false` otherwise
|
|
17
|
+
*/
|
|
18
|
+
export function isValidDockerComposeProjectName(projectName) {
|
|
19
|
+
requireString('projectName', projectName);
|
|
20
|
+
// Ensure first char is a lowercase letter or digit
|
|
21
|
+
if (!/^[a-z0-9]/.test(projectName[0])) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
// Ensure the rest of the chars are only lowercase letters, digits, dashes and underscores
|
|
25
|
+
return /^[a-z0-9-_]+$/.test(projectName);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Check if the string is a valid docker container name:
|
|
29
|
+
*
|
|
30
|
+
* - Must start with a letter or digit
|
|
31
|
+
* - Contain only letters, digits, underscores and periods
|
|
32
|
+
* - Must not end with a period
|
|
33
|
+
* @param containerName The docker container name to validate.
|
|
34
|
+
* @returns `true` if valid, `false otherwise
|
|
35
|
+
*/
|
|
36
|
+
export function isValidDockerContainerName(containerName) {
|
|
37
|
+
return /[a-zA-Z0-9][a-zA-Z0-9_.-]+/.test(containerName) && !containerName.endsWith('.');
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* For docker compose commands, see https://docs.docker.com/compose/reference/. For available options for this wrapper function, see {@link DockerComposeOptions}.
|
|
41
|
+
*
|
|
42
|
+
* The current working directory will be the directory of the {@link dockerComposePath} unless specified in the options. This ensures relative paths in the
|
|
43
|
+
* docker compose file will be relative to itself by default.
|
|
44
|
+
*
|
|
45
|
+
* See {@link DockerComposeOptions.projectName} for info on where to locate your docker compose file and how to specify the docker project name.
|
|
46
|
+
* @param dockerComposePath Path to docker-compose.yml
|
|
47
|
+
* @param dockerComposeCommand The docker-compose command to run
|
|
48
|
+
* @param options {@link DockerComposeOptions} to use, including additional arguments to pass to the docker compose command and the project name
|
|
49
|
+
*/
|
|
50
|
+
export async function spawnDockerCompose(dockerComposePath, dockerComposeCommand, options) {
|
|
51
|
+
requireValidPath('dockerComposePath', dockerComposePath);
|
|
52
|
+
requireString('dockerComposeCommand', dockerComposeCommand);
|
|
53
|
+
if (options?.cwd) {
|
|
54
|
+
requireValidPath('cwd', options.cwd);
|
|
55
|
+
}
|
|
56
|
+
if (options?.altEnvFilePath) {
|
|
57
|
+
requireValidPath('altEnvFilePath', options.altEnvFilePath);
|
|
58
|
+
}
|
|
59
|
+
if (options?.projectName && !isValidDockerComposeProjectName(options.projectName)) {
|
|
60
|
+
throw new Error('Invalid docker compose project name specified for the projectName param. Project names must contain only lowercase letters, decimal digits, dashes, and underscores, and must begin with a lowercase letter or decimal digit.');
|
|
61
|
+
}
|
|
62
|
+
if (options?.profile && !/[a-zA-Z0-9][a-zA-Z0-9_.-]+/.test(options.profile)) {
|
|
63
|
+
throw new Error('Invalid profile option - must match regex: [a-zA-Z0-9][a-zA-Z0-9_.-]+');
|
|
64
|
+
}
|
|
65
|
+
if (!await isDockerRunning()) {
|
|
66
|
+
throw new Error('Docker is not running');
|
|
67
|
+
}
|
|
68
|
+
const defaultOptions = { args: [], attached: false, projectName: undefined, cwd: undefined };
|
|
69
|
+
const mergedOptions = { ...defaultOptions, ...options };
|
|
70
|
+
if (!options || options.useWslPrefix === undefined) {
|
|
71
|
+
mergedOptions.useWslPrefix = config.useWslPrefixForDockerCommandsOnWindows;
|
|
72
|
+
}
|
|
73
|
+
const dockerComposeDir = path.dirname(dockerComposePath);
|
|
74
|
+
const dockerComposeFilename = path.basename(dockerComposePath);
|
|
75
|
+
if (!mergedOptions.cwd) {
|
|
76
|
+
mergedOptions.cwd = dockerComposeDir;
|
|
77
|
+
}
|
|
78
|
+
let dockerComposePathResolved = mergedOptions.cwd ? path.resolve(dockerComposePath) : dockerComposeFilename;
|
|
79
|
+
if (mergedOptions.useWslPrefix) {
|
|
80
|
+
dockerComposePathResolved = toWslPath(dockerComposePathResolved);
|
|
81
|
+
}
|
|
82
|
+
let spawnArgs = ['compose', '-f', dockerComposePathResolved];
|
|
83
|
+
if (mergedOptions.projectName) {
|
|
84
|
+
spawnArgs.push('--project-name', mergedOptions.projectName);
|
|
85
|
+
}
|
|
86
|
+
if (mergedOptions.profile) {
|
|
87
|
+
spawnArgs.push('--profile', mergedOptions.profile);
|
|
88
|
+
}
|
|
89
|
+
if (mergedOptions.altEnvFilePath) {
|
|
90
|
+
spawnArgs.push('--env-file', mergedOptions.useWslPrefix ? toWslPath(mergedOptions.altEnvFilePath) : mergedOptions.altEnvFilePath);
|
|
91
|
+
}
|
|
92
|
+
spawnArgs.push(dockerComposeCommand);
|
|
93
|
+
if (!mergedOptions.attached && dockerComposeCommandsThatSupportDetached.includes(dockerComposeCommand)) {
|
|
94
|
+
spawnArgs.push('--detach');
|
|
95
|
+
}
|
|
96
|
+
if (mergedOptions.args) {
|
|
97
|
+
spawnArgs = spawnArgs.concat(mergedOptions.args);
|
|
98
|
+
}
|
|
99
|
+
trace(`running command in ${mergedOptions.cwd}: docker ${spawnArgs.join(' ')}`);
|
|
100
|
+
const longRunning = dockerComposeCommandsThatSupportDetached.includes(dockerComposeCommand) && options?.attached === true;
|
|
101
|
+
trace(`docker compose command will be configured to use long running option: ${longRunning}`);
|
|
102
|
+
const spawnOptions = {
|
|
103
|
+
cwd: mergedOptions.cwd,
|
|
104
|
+
shell: isPlatformWindows(),
|
|
105
|
+
isLongRunning: longRunning
|
|
106
|
+
};
|
|
107
|
+
const spawnResult = mergedOptions.useWslPrefix ?
|
|
108
|
+
await spawnAsyncInternal('wsl', ['docker', ...spawnArgs], spawnOptions) :
|
|
109
|
+
await spawnAsyncInternal('docker', spawnArgs, spawnOptions);
|
|
110
|
+
if (spawnResult.code !== 0) {
|
|
111
|
+
throw new Error(`docker compose command failed with code ${spawnResult.code}`);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Similar to {@link simpleSpawnAsync} but meant for `docker` calls only. Determines whether to run `docker` or `wsl docker` based
|
|
116
|
+
* on platform being windows and config setting `useWslPrefixForDockerCommands`.
|
|
117
|
+
* @param args The args to be passed to the docker command.
|
|
118
|
+
*/
|
|
119
|
+
export async function simpleSpawnDockerAsync(args) {
|
|
120
|
+
const command = config.useWslPrefixForDockerCommandsOnWindows ? 'wsl' : 'docker';
|
|
121
|
+
const spawnArgs = command === 'docker' ? args : ['docker', ...args];
|
|
122
|
+
return await simpleSpawnAsync(command, spawnArgs);
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Uses {@link which} to determine if docker is installed. If the `which` call doesn't find docker and the platform
|
|
126
|
+
* is Windows, then this will check the output of `wsl docker --version` to see if just the engine is installed.
|
|
127
|
+
* @returns `true` if docker is installed, `false` otherwise
|
|
128
|
+
*/
|
|
129
|
+
export async function isDockerInstalled() {
|
|
130
|
+
if ((await which('docker')).location) {
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
if (isPlatformWindows()) {
|
|
134
|
+
const result = await simpleSpawnAsync('wsl', ['docker', '--version']);
|
|
135
|
+
return result.code === 0;
|
|
136
|
+
}
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Runs the `docker info` command and looks for "error during connect" in the output to determine if docker is running. If you
|
|
141
|
+
* want to check if docker is installed, use {@link isDockerInstalled}.
|
|
142
|
+
* @returns `true` if docker is installed and running, `false` otherwise
|
|
143
|
+
*/
|
|
144
|
+
export async function isDockerRunning() {
|
|
145
|
+
try {
|
|
146
|
+
const result = isPlatformWindows() ?
|
|
147
|
+
await simpleSpawnAsync('wsl', ['docker', 'info']) :
|
|
148
|
+
await simpleSpawnAsync('docker', ['info']);
|
|
149
|
+
return result.code === 0 && !result.stdout.includes('error during connect');
|
|
150
|
+
}
|
|
151
|
+
catch (err) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* Attempt to start the docker service if it isn't running. Whether it's running is determined by a call to {@link isDockerRunning}.
|
|
157
|
+
*
|
|
158
|
+
* Notes on docker startup command:
|
|
159
|
+
* - May require entering a password
|
|
160
|
+
* - On Windows with Docker Desktop and from within powershell or cmd it will run in powershell: `Start-Process "C:\Program Files\Docker\Docker\Docker Desktop.exe" -NoNewWindow`
|
|
161
|
+
* - On Windows without Docker Desktop from within powershell or cmd it will run: `sudo service docker start`
|
|
162
|
+
* - On Linux (including WSL) it will run: `sudo systemctl start docker`
|
|
163
|
+
* - Not currently supported on Mac
|
|
164
|
+
* - If you're on Windows and have Docker Desktop but it is stopped and you're in a WSL shell, docker will appear as if it's not installed and this method will throw
|
|
165
|
+
*
|
|
166
|
+
* @throws An {@link Error} If docker is not detected on the system.
|
|
167
|
+
* @throws An {@link Error} if docker is detected as installed and not running but the OS is Mac.
|
|
168
|
+
*/
|
|
169
|
+
export async function ensureDockerRunning() {
|
|
170
|
+
if (!await isDockerInstalled()) {
|
|
171
|
+
throw new Error('Docker does not appear to be installed');
|
|
172
|
+
}
|
|
173
|
+
if (await isDockerRunning()) {
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
let command;
|
|
177
|
+
let args = [];
|
|
178
|
+
const isWindows = isPlatformWindows();
|
|
179
|
+
const isLinux = isPlatformLinux();
|
|
180
|
+
const dockerDesktopPath = 'C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe';
|
|
181
|
+
let useExec = false;
|
|
182
|
+
if (isWindows) {
|
|
183
|
+
if (fs.existsSync(dockerDesktopPath)) {
|
|
184
|
+
command = 'powershell';
|
|
185
|
+
args = getPowershellHackArgs(`Start-Process 'C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe' -NoNewWindow`);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
command = 'C:\\windows\\system32\\wsl.exe -u root -e sh -c "service docker start"';
|
|
189
|
+
useExec = true;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
else if (isLinux) {
|
|
193
|
+
command = 'sudo';
|
|
194
|
+
args = ['service', 'docker', 'start'];
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
throw new Error('Starting docker within ensureDockerRunning is only supported on Windows and Linux - you will have to start docker manually');
|
|
198
|
+
}
|
|
199
|
+
if (useExec) {
|
|
200
|
+
try {
|
|
201
|
+
execSync(command, { stdio: 'inherit' });
|
|
202
|
+
}
|
|
203
|
+
catch (err) {
|
|
204
|
+
throw new ExtendedError('Unable to start docker', getNormalizedError(err));
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
else {
|
|
208
|
+
const result = await spawnAsync(command, args, { shell: isWindows });
|
|
209
|
+
if (result.code !== 0) {
|
|
210
|
+
throw new Error('Unable to start docker - see error above');
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
// Wait for docker to be up and ready before continuing
|
|
214
|
+
await withRetryAsync(throwIfDockerNotReady, 6, 3000, { initialDelayMilliseconds: 3000 });
|
|
215
|
+
}
|
|
216
|
+
/**
|
|
217
|
+
* The name of a docker volume to delete. Respects the config value `useWslPrefixForDockerCommands`.
|
|
218
|
+
* @param volumeName The name of the docker volume to delete.
|
|
219
|
+
* @throws An {@link ExtendedError} if the volume does not exist or the volume is in use.
|
|
220
|
+
*/
|
|
221
|
+
export async function deleteDockerComposeVolume(volumeName) {
|
|
222
|
+
requireString('volumeName', volumeName);
|
|
223
|
+
// Docker compose volume names will have the same character restrictions as docker compose project names
|
|
224
|
+
if (!isValidDockerComposeProjectName(volumeName)) {
|
|
225
|
+
throw new Error(`Invalid volume name: ${volumeName}`);
|
|
226
|
+
}
|
|
227
|
+
try {
|
|
228
|
+
const composeVolumeName = await getDockerComposeVolumeName(volumeName);
|
|
229
|
+
if (!composeVolumeName) {
|
|
230
|
+
log(`volume ${volumeName} not found in docker compose config - skipping`);
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
if (!await dockerVolumeExists(composeVolumeName)) {
|
|
234
|
+
log(`docker compose volume ${composeVolumeName} does not appear to exist - skipping`);
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
await deleteDockerVolume(composeVolumeName);
|
|
238
|
+
}
|
|
239
|
+
catch (err) {
|
|
240
|
+
throw new ExtendedError(`Error removing the volume ${volumeName}`, getNormalizedError(err));
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
/**
|
|
244
|
+
* This function will take the volume name as you defined it in `docker-compose.yml` and try getting the actual volume name that docker
|
|
245
|
+
* compose will use. This is needed because docker compose will prefix the volume name with the compose project name (directory name or env
|
|
246
|
+
* `COMPOSE_PROJECT_NAME` or `-p` passed to docker compose commands).
|
|
247
|
+
*
|
|
248
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
249
|
+
* @param volumeName The volume name as defined in the `docker-compose.yml` file.
|
|
250
|
+
* @returns The full name of the docker-compose-actualized docker volume.
|
|
251
|
+
*/
|
|
252
|
+
export async function getDockerComposeVolumeName(volumeName) {
|
|
253
|
+
const result = await simpleSpawnDockerAsync(['compose', 'config', '--format', 'json']);
|
|
254
|
+
const composeConfigJson = JSON.parse(result.stdout);
|
|
255
|
+
return composeConfigJson?.volumes?.[volumeName]?.name;
|
|
256
|
+
}
|
|
257
|
+
/**
|
|
258
|
+
* Check if a docker volume exists based on inclusion of the specified `volumeName` in any of the output lines of `docker volume ls`.
|
|
259
|
+
*
|
|
260
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
261
|
+
* @param volumeName The docker volume name to check.
|
|
262
|
+
* @returns `true` if the docker volume exists, otherwise `false`.
|
|
263
|
+
*/
|
|
264
|
+
export async function dockerVolumeExists(volumeName) {
|
|
265
|
+
const result = await simpleSpawnDockerAsync(['volume', 'ls']);
|
|
266
|
+
return result.stdoutLines.filter(ln => ln.includes(volumeName)).length > 0;
|
|
267
|
+
}
|
|
268
|
+
/**
|
|
269
|
+
* This will attempt to delete a docker volume using the `docker volume rm` command.
|
|
270
|
+
*
|
|
271
|
+
* **Warning: ** there will be no prompt or confirmation before attempting to delete the volume.
|
|
272
|
+
*
|
|
273
|
+
* This function respects the `useWslPrefixForDockerCommands` config option. See also: {@link deleteDockerComposeVolume}.
|
|
274
|
+
* @param volumeName The name of the docker volume to delete.
|
|
275
|
+
* @throws An {@link Error} if the volume doesn't exist or is in use.
|
|
276
|
+
*/
|
|
277
|
+
export async function deleteDockerVolume(volumeName) {
|
|
278
|
+
trace(`deleting docker compose volume ${volumeName}`);
|
|
279
|
+
await simpleSpawnDockerAsync(['volume', 'rm', volumeName]);
|
|
280
|
+
}
|
|
281
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockerUtils.js","sourceRoot":"","sources":["../../src/dockerUtils.ts"],"names":[],"mappings":"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"}
|