arui-scripts 13.2.1 → 13.3.0-feat-fast-docker-build.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [13.3.0-feat-fast-docker-build.2](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.3.0-feat-fast-docker-build.1...v13.3.0-feat-fast-docker-build.2) (2022-12-06)
+
+
+### Features
+
+* **docker-fast:** don't build anything inside of container ([8f255bd](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/8f255bd8fb9818a8498bddee71ef83ce4a7ba11b))
+
+# [13.3.0-feat-fast-docker-build.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.2.1...v13.3.0-feat-fast-docker-build.1) (2022-12-05)
+
+
+### Features
+
+* **docker:** add fast docker build command ([82301a8](https://git.moscow.alfaintra.net/ef/arui-scripts/commit/82301a8d912476fd5516f94083ccd7c5363f4509))
+
 ## [13.2.1](https://git.moscow.alfaintra.net/ef/arui-scripts/compare/v13.2.0...v13.2.1) (2022-12-05)
 
 

package/build/bin/index.js

@@ -5,6 +5,7 @@ const commands = [
     'start',
     'build',
     'docker-build',
+    'docker-build-fast',
     'test',
     'ensure-yarn',
     'archive-build',

package/build/commands/docker-build-fast/index.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,91 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const dockerfile_fast_template_1 = __importDefault(require("../../templates/dockerfile-fast.template"));
+const nginx_conf_template_1 = __importDefault(require("../../templates/nginx.conf.template"));
+const start_template_1 = __importDefault(require("../../templates/start.template"));
+const exec_1 = __importDefault(require("../util/exec"));
+let imageVersion = app_configs_1.default.version;
+let imageName = app_configs_1.default.name;
+let dockerRegistry = app_configs_1.default.dockerRegistry;
+const commandLineArguments = process.argv.slice(3);
+commandLineArguments.forEach(arg => {
+    let [argName, argValue] = arg.split('=');
+    argName = argName.toLowerCase().trim();
+    argValue = argValue ? argValue.trim() : '';
+    switch (argName) {
+        case 'version':
+            imageVersion = argValue;
+            break;
+        case 'name':
+            imageName = argValue;
+            break;
+        case 'registry':
+            dockerRegistry = argValue;
+            break;
+        default:
+            console.warn(`Unknown argument ${argName}`);
+    }
+});
+const tempDirName = '.docker-build';
+const pathToTempDir = path_1.default.join(app_configs_1.default.cwd, tempDirName);
+const imageFullName = `${dockerRegistry ? `${dockerRegistry}/` : ''}${imageName}:${imageVersion}`;
+(() => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        console.log(`Build docker image ${imageFullName}`);
+        console.time('Total time');
+        console.time('Setting up time');
+        // create tmp directory for docker related files
+        // We need to copy it because we will remove this directory during build process
+        yield fs_extra_1.default.emptyDir(pathToTempDir);
+        const nginxConf = app_configs_1.default.localNginxConf
+            ? yield fs_extra_1.default.readFile(app_configs_1.default.localNginxConf, 'utf8')
+            : nginx_conf_template_1.default;
+        const dockerfile = app_configs_1.default.localDockerfile
+            ? yield fs_extra_1.default.readFile(app_configs_1.default.localDockerfile, 'utf8')
+            : dockerfile_fast_template_1.default;
+        yield Promise.all([
+            fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'Dockerfile'), dockerfile, 'utf8'),
+            fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'nginx.conf'), nginxConf, 'utf8'),
+            fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'start.sh'), start_template_1.default, { encoding: 'utf8', mode: 0o555 }),
+            fs_extra_1.default.remove(app_configs_1.default.buildPath),
+        ]);
+        console.timeEnd('Setting up time');
+        console.time('Build docker image time');
+        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} .`);
+        console.timeEnd('Build docker image time');
+        console.time('Cleanup time');
+        // remove temp directory
+        yield fs_extra_1.default.remove(pathToTempDir);
+        // guard against pushing the image during tests
+        if (!app_configs_1.default.debug) {
+            yield exec_1.default(`docker push ${imageFullName}`);
+        }
+        console.timeEnd('Cleanup time');
+        console.timeEnd('Total time');
+    }
+    catch (err) {
+        yield fs_extra_1.default.remove(pathToTempDir);
+        console.error('Error during docker-build.');
+        if (app_configs_1.default.debug) {
+            console.error(err);
+        }
+        process.exit(1);
+    }
+}))();

package/build/commands/util/exec.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const shelljs_1 = __importDefault(require("shelljs"));
 function exec(command) {
     return new Promise((resolve, reject) => {
+        console.log(`Executing command: ${command}`);
         shelljs_1.default.exec(command, (code) => {
             if (code === 0) {
                 return resolve(code);

package/build/configs/util/apply-overrides.d.ts

@@ -21,6 +21,7 @@ declare type Overrides = {
     browsers: string[];
     supportingBrowsers: string[];
     Dockerfile: string;
+    'Dockerfile-fast': string;
     nginx: string;
     'start.sh': string;
 };

package/build/templates/dockerfile-fast.template.d.ts

@@ -0,0 +1,2 @@
+declare const _default: string;
+export default _default;

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

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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 dockerfileTemplate = `
+FROM ${app_configs_1.default.baseDockerImage}
+ARG START_SH_LOCATION
+ARG NGINX_CONF_LOCATION
+
+USER nginx
+WORKDIR /src
+RUN mkdir -p /var/lib/nginx && \
+    chown -R nginx:nginx /var/lib/nginx && \
+    chown -R nginx:nginx /var/log/nginx && \
+    chown -R nginx:nginx /etc/nginx/conf.d
+
+RUN touch /var/run/nginx.pid && \
+   chown -R nginx:nginx /var/run/nginx.pid
+
+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 yarn install --production --ignore-optional --frozen-lockfile --ignore-scripts --prefer-offline  && \\
+    yarn cache clean
+ADD --chown=nginx:nginx . /src
+`;
+exports.default = apply_overrides_1.default('Dockerfile-fast', dockerfileTemplate);

package/build/tsconfig-local.tsbuildinfo

@@ -742,8 +742,8 @@
         "affectsGlobalScope": false
       },
       "../src/configs/util/apply-overrides.ts": {
-        "version": "74b9ac3c6771735628ef3d245b6ef6c077555b2097f30b0d1db62b8c12a6481c",
-        "signature": "122fdc32edf36c57e8d8fb7376714c74d3c8061640c07017c53882dd8e902642",
+        "version": "6ffec1ba6cb9eee767269fe0000dfe6e30a6d116c0cf78ce93367cb80de8722e",
+        "signature": "26844f518d1d8e3f8833e01de394c10e5e878ebf3b11b7d8ffa0e8c52add4c5a",
         "affectsGlobalScope": false
       },
       "../src/index.ts": {
@@ -757,7 +757,7 @@
         "affectsGlobalScope": false
       },
       "../src/bin/index.ts": {
-        "version": "c9c7a2b0b4b64f0aa8bd2a5d7803ee148b549947e4c1349f0d403d4d145c7282",
+        "version": "dcaf4446fc2d9ff375b12ff54daeff02f2f9396ee13aecb05710bb3bbe0b8677",
         "signature": "2ac79bb3486c40467f86c9c30cc50e06ab428b7308602e4827e49a09ecede366",
         "affectsGlobalScope": true
       },
@@ -792,7 +792,7 @@
         "affectsGlobalScope": false
       },
       "../src/commands/util/exec.ts": {
-        "version": "0e7ba854cd493e9f12e139ede9e4807aa2339a356c338b65b7ae35f57c9aef6c",
+        "version": "0eecf1a11c1427a78dd57a74d00dac418979623ae54e5e678545c03f23cde119",
         "signature": "cbab75ff7efc7cca9f9a2dbcff2daf293b8f2dc4255b4bf2d6cd8f87d6ee7794",
         "affectsGlobalScope": false
       },
@@ -1331,6 +1331,16 @@
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
         "affectsGlobalScope": false
       },
+      "../src/templates/dockerfile-fast.template.ts": {
+        "version": "78b3651d2f51bcd4c24ccf00def5a2cf377cecc7044d529582b1319390d0fd3b",
+        "signature": "0fffbf1a5f54522ff7b89592bab1cf72966d7bdc613d52b0087717fcfec14b29",
+        "affectsGlobalScope": false
+      },
+      "../src/commands/docker-build-fast/index.ts": {
+        "version": "f4a693ea311275f3493c35ef55079adbec1c1c24162c7c7f2c8c42e1cf9b758e",
+        "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
+        "affectsGlobalScope": false
+      },
       "../src/commands/ensure-yarn/index.ts": {
         "version": "aebd321455246c816849cb05ee9d873c31cb9732b1f2313763c7e776125b1209",
         "signature": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -5798,6 +5808,20 @@
         "../src/configs/app-configs/index.ts",
         "../src/configs/webpack.client.prod.ts"
       ],
+      "../src/commands/docker-build-fast/index.ts": [
+        "../../../node_modules/@types/fs-extra/index.d.ts",
+        "../../../node_modules/@types/graceful-fs/index.d.ts",
+        "../node_modules/@types/node/ts3.1/fs.d.ts",
+        "../node_modules/@types/node/ts3.1/path.d.ts",
+        "../node_modules/@types/node/ts3.1/util.d.ts",
+        "../node_modules/@types/node/ts3.3/fs.d.ts",
+        "../node_modules/@types/node/ts3.3/util.d.ts",
+        "../src/commands/util/exec.ts",
+        "../src/configs/app-configs/index.ts",
+        "../src/templates/dockerfile-fast.template.ts",
+        "../src/templates/nginx.conf.template.ts",
+        "../src/templates/start.template.ts"
+      ],
       "../src/commands/docker-build/index.ts": [
         "../../../node_modules/@types/fs-extra/index.d.ts",
         "../../../node_modules/@types/graceful-fs/index.d.ts",
@@ -6376,6 +6400,15 @@
         "../node_modules/@types/node/ts3.3/fs.d.ts",
         "../node_modules/@types/node/ts3.3/util.d.ts"
       ],
+      "../src/templates/dockerfile-fast.template.ts": [
+        "../../../node_modules/@types/graceful-fs/index.d.ts",
+        "../node_modules/@types/node/ts3.1/fs.d.ts",
+        "../node_modules/@types/node/ts3.1/util.d.ts",
+        "../node_modules/@types/node/ts3.3/fs.d.ts",
+        "../node_modules/@types/node/ts3.3/util.d.ts",
+        "../src/configs/app-configs/index.ts",
+        "../src/configs/util/apply-overrides.ts"
+      ],
       "../src/templates/dockerfile.template.ts": [
         "../../../node_modules/@types/graceful-fs/index.d.ts",
         "../node_modules/@types/node/ts3.1/fs.d.ts",
@@ -9918,8 +9951,8 @@
         "../../../.yarn/__virtual__/webpack-virtual-321c743fbb/0/cache/webpack-npm-5.59.0-c550703883-3ccda49eaf.zip/node_modules/webpack/types.d.ts"
       ],
       "../src/configs/util/apply-overrides.ts": [
-        "../../../.yarn/__virtual__/webpack-virtual-321c743fbb/0/cache/webpack-npm-5.59.0-c550703883-3ccda49eaf.zip/node_modules/webpack/types.d.ts",
-        "../../../.yarn/cache/@types-webpack-dev-server-npm-4.3.1-3914e7b755-d0f0eea78f.zip/node_modules/@types/webpack-dev-server/index.d.ts",
+        "../../../node_modules/@types/webpack-dev-server/index.d.ts",
+        "../../../node_modules/webpack/types.d.ts",
         "../src/configs/app-configs/types.ts"
       ],
       "../src/configs/util/get-polyfills.ts": [
@@ -10338,6 +10371,7 @@
       "../src/commands/build/index.ts",
       "../src/commands/build/server.ts",
       "../src/commands/bundle-analyze/index.ts",
+      "../src/commands/docker-build-fast/index.ts",
       "../src/commands/docker-build/index.ts",
       "../src/commands/ensure-yarn/index.ts",
       "../src/commands/start/client.ts",
@@ -10395,6 +10429,7 @@
       "../src/configs/webpack.server.prod.ts",
       "../src/index.ts",
       "../src/plugins/reload-server-webpack-plugin.js",
+      "../src/templates/dockerfile-fast.template.ts",
       "../src/templates/dockerfile.template.ts",
       "../src/templates/nginx.conf.template.ts",
       "../src/templates/start.template.ts",

package/package.json

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