yakuza0 2.23.3 → 2.23.4-beta.0
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/cli/index.js +7 -5
- package/package.json +1 -1
package/cli/index.js
CHANGED
|
@@ -376,7 +376,7 @@ var run = exports.run = function () {
|
|
|
376
376
|
// const {success: isTestInner} = connectionTester.test('fe-repo.inner.px.nfjbill.ren', 5000, 1000)
|
|
377
377
|
|
|
378
378
|
try {
|
|
379
|
-
res = (0, _syncRequest2.default)('GET', '
|
|
379
|
+
res = (0, _syncRequest2.default)('GET', 'https://sl.rdc.nfjbill.ren/sys/health-check', {
|
|
380
380
|
timeout: 1000
|
|
381
381
|
});
|
|
382
382
|
inner = JSON.parse(res.getBody('utf8'));
|
|
@@ -407,7 +407,7 @@ var run = exports.run = function () {
|
|
|
407
407
|
projectName = process.env.CLN_IMAGE_NAME || projectName;
|
|
408
408
|
imageReleaseName = projectName + ':' + CLNVERSION;
|
|
409
409
|
imageReleaseNameSave = projectName + '_' + CLNVERSION;
|
|
410
|
-
BI = process.env.CLN_IMAGE_BI || (isInner ? '
|
|
410
|
+
BI = process.env.CLN_IMAGE_BI || (isInner ? 'image-registry.rdc.nfjbill.ren/cln-server:0.7.0' : 'nfjbill/cln-server:0.7.0');
|
|
411
411
|
preLoad = (process.env.CLN_IMAGE_LOAD || '').split(',');
|
|
412
412
|
// let BI = process.env.CLN_IMAGE_BI
|
|
413
413
|
|
|
@@ -417,7 +417,9 @@ var run = exports.run = function () {
|
|
|
417
417
|
Dockerfile = "Dockerfile";
|
|
418
418
|
buildkit = "DOCKER_BUILDKIT=1";
|
|
419
419
|
prefixCmd = "";
|
|
420
|
-
suffixCmd = process.env.CLN_IMAGE_SUFFIX !== undefined ? process.env.CLN_IMAGE_SUFFIX : " >/dev/null 2>&1"
|
|
420
|
+
// let suffixCmd = process.env.CLN_IMAGE_SUFFIX !== undefined ? process.env.CLN_IMAGE_SUFFIX : " >/dev/null 2>&1"
|
|
421
|
+
|
|
422
|
+
suffixCmd = process.env.CLN_IMAGE_SUFFIX !== undefined ? process.env.CLN_IMAGE_SUFFIX : "";
|
|
421
423
|
|
|
422
424
|
if (_os2.default.platform() === 'win32') {
|
|
423
425
|
prefixCmd = "cross-env ";
|
|
@@ -426,7 +428,7 @@ var run = exports.run = function () {
|
|
|
426
428
|
|
|
427
429
|
if (DEP) {
|
|
428
430
|
Dockerfile = "Dockerfile_DEP";
|
|
429
|
-
BI = BI || "
|
|
431
|
+
BI = BI || "image-registry.rdc.nfjbill.ren/cln-server:0.7.0";
|
|
430
432
|
}
|
|
431
433
|
|
|
432
434
|
if (preLoad.length > 0) {
|
|
@@ -459,7 +461,7 @@ var run = exports.run = function () {
|
|
|
459
461
|
|
|
460
462
|
case 36:
|
|
461
463
|
if (!(0, _commandExists.sync)('pxnpm') && !DEP) {
|
|
462
|
-
execCmd(isInner ? 'npm i -g pxnpm --registry=http://
|
|
464
|
+
execCmd(isInner ? 'npm i -g pxnpm --registry=http://tpl.cln3.nfjbill.ren:20021' : 'npm i -g pxnpm');
|
|
463
465
|
}
|
|
464
466
|
if (!(0, _commandExists.sync)('cross-env') && !DEP) {
|
|
465
467
|
execCmd('pxnpm i -g cross-env');
|