yakuza0 2.22.15-beta.1 → 2.22.15-beta.2

package/cli/index.js

@@ -322,7 +322,7 @@ var run = exports.run = function () {
             }());
 
             _commander2.default.command('image').description('Build image.').option('-nc, --no-cache', 'Do not use cache when building the image').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-              var _connectionTester$tes, isInner, CS, CLNENV, noCache, CLNWORKERS, CLNVERSION, pkg, NMCI, projectName, obj, imageReleaseName, imageReleaseNameSave, BI;
+              var _connectionTester$tes, isInner, CS, CLNENV, noCache, CLNWORKERS, TRY_TIMES, CLNVERSION, pkg, NMCI, projectName, obj, imageReleaseName, imageReleaseNameSave, BI, loop;
 
               return _regenerator2.default.wrap(function _callee5$(_context5) {
                 while (1) {
@@ -333,6 +333,7 @@ var run = exports.run = function () {
                       CLNENV = process.env.CLN_IMAGE_ENV || 'docker';
                       noCache = process.env.NO_CACHE === '1';
                       CLNWORKERS = process.env.CLN_IMAGE_WORKERS || '2';
+                      TRY_TIMES = process.env.TRY_TIMES || '3';
                       CLNVERSION = process.env.CLN_IMAGE_VERSION || CS;
                       pkg = _paths2.default.read(_paths2.default.appPackageJson);
                       NMCI = 'nm_' + (0, _server.md5)(pkg).substring(0, 6);
@@ -350,7 +351,7 @@ var run = exports.run = function () {
                       BI = isInner ? 'fe-repo.inner.px.nfjbill.ren:5000/cln-server:0.5.4' : 'nfjbill/cln-server:0.5.4';
 
                       if ((0, _commandExists.sync)('docker')) {
-                        _context5.next = 17;
+                        _context5.next = 18;
                         break;
                       }
 
@@ -358,7 +359,7 @@ var run = exports.run = function () {
                       process.exit(1);
                       return _context5.abrupt('return');
 
-                    case 17:
+                    case 18:
                       if (!(0, _commandExists.sync)('pxnpm')) {
                         execCmd(isInner ? 'npm i -g pxnpm --registry=http://fe-repo.inner.px.nfjbill.ren:5507' : 'npm i -g pxnpm');
                       }
@@ -367,12 +368,26 @@ var run = exports.run = function () {
                       }
 
                       execCmd('cross-env YK_ENV=' + CLNENV + ' YK_SERVER_ENV=' + CLNENV + ' YK_VERSIONSHA=' + CS + ' YK_DOCKERNAME=' + CS + ' YK_MACHINE_TYPE=workstation YK0_env=docker pxnpm run build -workers=' + CLNWORKERS);
-                      execCmd('cross-env DOCKER_BUILDKIT=1 docker build ' + (noCache ? '--no-cache' : '') + ' -f ' + _paths2.default.ykRootImage + 'Dockerfile --build-arg BASE_IMAGE=' + BI + ' --build-arg YK_VERSIONSHA=' + CS + ' --build-arg YK_ENV=' + CLNENV + ' --build-arg NPM_MODULES_CACHE_ID=' + NMCI + ' -t ' + imageReleaseName + ' .');
 
-                      _context5.next = 23;
+                      loop = function loop(i) {
+                        try {
+                          if (i < parseInt(TRY_TIMES)) {
+                            execCmd('cross-env DOCKER_BUILDKIT=1 docker build ' + (noCache ? '--no-cache' : '') + ' -f ' + _paths2.default.ykRootImage + 'Dockerfile --build-arg BASE_IMAGE=' + BI + ' --build-arg YK_VERSIONSHA=' + CS + ' --build-arg YK_ENV=' + CLNENV + ' --build-arg NPM_MODULES_CACHE_ID=' + NMCI + ' -t ' + imageReleaseName + ' .');
+                          } else {
+                            _consola2.default.error('Image build failure!');
+                            process.exit(0);
+                          }
+                        } catch (e) {
+                          loop(i + 1);
+                        }
+                      };
+
+                      loop(0);
+
+                      _context5.next = 25;
                       return (0, _server.delay)(1000);
 
-                    case 23:
+                    case 25:
 
                       if (!(0, _commandExists.sync)('gzip')) {
                         execCmd('docker save > ' + imageReleaseNameSave + '.tar ' + imageReleaseName);
@@ -384,7 +399,7 @@ var run = exports.run = function () {
                       _consola2.default.info('Image name: ' + imageReleaseName);
                       _consola2.default.info('Image production completed！');
 
-                    case 27:
+                    case 29:
                     case 'end':
                       return _context5.stop();
                   }

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "yakuza0",
-  "version": "2.22.15-beta.1",
+  "version": "2.22.15-beta.2",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
+    "base": "babel --no-babelrc src -d /Users/ningfujun/work/repo/web/CLN_BASE_TEST/node_modules/yakuza0 -w --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
     "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --tag beta",
     "pub:hotfix": "npm run build && npm version prerelease --preid=hotfix && npm publish --tag hotfix",