arui-scripts 13.3.0 → 13.3.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [13.3.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.3.0...v13.3.1) (2022-12-13)
+
+
+### Bug Fixes
+
+* **docker-build-compiled:** add yarn2 required files before build ([c252535](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/c2525358e7573e599bbdb20160453cc077f5a083))
+* **docker-build-compiled:** don't override existing .dockerignore ([b0c20c2](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/b0c20c25792edbb5b73cd2bb36725b214cb4aadd))
+
 # [13.3.0](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.2.1...v13.3.0) (2022-12-08)
 
 

package/build/commands/docker-build-compiled/index.js

@@ -31,7 +31,7 @@ const docker_build_1 = require("../util/docker-build");
             startScript: start_template_1.default,
             allowLocalDockerfile: false,
         });
-        yield exec_1.default('echo "node_modules" > .dockerignore');
+        yield exec_1.default('echo "node_modules" >> .dockerignore');
         yield exec_1.default(`docker build -f "./${tempDirName}/Dockerfile" \\
  --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" \\
  --build-arg NGINX_CONF_LOCATION="./${tempDirName}/nginx.conf" -t ${imageFullName} .`);

package/build/commands/util/yarn.d.ts

@@ -1,4 +1,5 @@
-declare type Yarn = '1' | '2+' | 'unavailable';
-export declare function getYarnVersion(): Yarn;
+declare type YarnVersion = '1' | '2+' | 'unavailable';
+export declare function getYarnVersion(): YarnVersion;
 export declare function getPruningCommand(): string;
+export declare function getInstallProductionCommand(): string;
 export {};

package/build/commands/util/yarn.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPruningCommand = exports.getYarnVersion = void 0;
+exports.getInstallProductionCommand = exports.getPruningCommand = exports.getYarnVersion = void 0;
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
 const shelljs_1 = __importDefault(require("shelljs"));
 function getYarnVersion() {
@@ -33,3 +33,21 @@ function getPruningCommand() {
     }
 }
 exports.getPruningCommand = getPruningCommand;
+function getInstallProductionCommand() {
+    const yarnVersion = getYarnVersion();
+    switch (yarnVersion) {
+        case '1': {
+            return 'yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline';
+        }
+        case '2+': {
+            return 'yarn workspaces focus --production --all';
+        }
+        case 'unavailable': {
+            return 'npm install --production';
+        }
+        default: {
+            return '';
+        }
+    }
+}
+exports.getInstallProductionCommand = getInstallProductionCommand;

package/build/templates/dockerfile-compiled.template.js

@@ -6,7 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const app_configs_1 = __importDefault(require("../configs/app-configs"));
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
 const yarn_1 = require("../commands/util/yarn");
-const pruneCommand = yarn_1.getPruningCommand();
+const installProductionCommand = yarn_1.getInstallProductionCommand();
+const yarnVersion = yarn_1.getYarnVersion();
+// В зависимости от используемого мендежера зависимостей для их установки нужно копировать разный набор файлов
+const filesRequiredToInstallDependencies = [
+    'package.json',
+    'yarn.lock',
+    yarnVersion === '2+' && '.yarnrc.yml',
+    yarnVersion === '2+' && '.yarn',
+    yarnVersion === 'unavailable' && 'package-lock.json',
+].filter(Boolean);
 const dockerfileTemplate = `
 FROM ${app_configs_1.default.baseDockerImage}
 ARG START_SH_LOCATION
@@ -19,10 +28,10 @@ ADD $START_SH_LOCATION /src/start.sh
 ADD $NGINX_CONF_LOCATION /src/nginx.conf
 
 # Зависимости. При некоторой удаче могут кешироваться и соответственно кешировать установку зависимостей
-ADD --chown=nginx:nginx yarn.lock /src/yarn.lock
-ADD --chown=nginx:nginx package.json /src/package.json
-RUN ${pruneCommand}  && \\
-    yarn cache clean
+${filesRequiredToInstallDependencies.map((file) => `ADD --chown=nginx:nginx ${file} /src/${file}`).join('\n')}
+
+RUN ${installProductionCommand}  && \\
+    ${yarnVersion === 'unavailable' ? 'npm cache clean --force' : 'yarn cache clean'}
 
 ADD --chown=nginx:nginx . /src
 

package/build/tsconfig-local.tsbuildinfo

@@ -812,8 +812,8 @@
         "affectsGlobalScope": false
       },
       "../src/commands/util/yarn.ts": {
-        "version": "dd12d363b52256367a5544cef5c9680bd61e2009c20c27b43030cda98e5442bc",
-        "signature": "5e4804f7f7c63d44608026235d1745631daf6b0a5b5be541290ef33b0d11506d",
+        "version": "a1bcdf2aa30695708c6515646afc4af07a7a82a5412b2767d0d99b03492770aa",
+        "signature": "bbedd649d02ef49ddad1a830281d0e9506b22849394c2617783f4d30ee6c310f",
         "affectsGlobalScope": false
       },
       "../src/commands/archive-build/index.ts": {
@@ -1342,12 +1342,12 @@
         "affectsGlobalScope": false
       },
       "../src/templates/dockerfile-compiled.template.ts": {
-        "version": "46a07d2e09f3188183ace3b4a4c1ec4e3d2158bcc34428203427cbd4af58a21a",
+        "version": "6b17e128c546b5122aeb3b6b0fd54cb3d2ccd55e336bfa9ffd5ab8525fa26835",
         "signature": "0fffbf1a5f54522ff7b89592bab1cf72966d7bdc613d52b0087717fcfec14b29",
         "affectsGlobalScope": false
       },
       "../src/commands/docker-build-compiled/index.ts": {
-        "version": "049601949b38615d0b35001e2c12d7fcd50a0b1df1670e3d271b6bc83b76d82a",
+        "version": "795b8a44ac56b87989f2dd38e635432d434235c7ee92531db9e53399f1ac7df2",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
         "affectsGlobalScope": false
       },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "arui-scripts",
-    "version": "13.3.0",
+    "version": "13.3.1",
     "main": "./build/index.js",
     "typings": "./build/index.d.ts",
     "license": "MPL-2.0",