arui-scripts 18.4.0 → 18.6.0

package/build/templates/base-nginx.conf.template.js

@@ -0,0 +1,61 @@
+"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 = require("../configs/app-configs");
+const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
+const baseNginxConfig = {
+    workerProcesses: 2,
+    workerRlimitNoFile: 20000,
+    workerConnections: 19000,
+    eventsUse: 'epoll',
+    daemon: 'off',
+};
+const nginx = Object.assign(Object.assign({}, baseNginxConfig), app_configs_1.configs.nginx);
+const baseNginxTemplate = `
+worker_processes            ${nginx.workerProcesses};
+worker_rlimit_nofile        ${nginx.workerRlimitNoFile};
+daemon                      ${nginx.daemon};
+
+error_log                   /var/log/nginx/error.log;
+pid                         /var/run/nginx.pid;
+
+events {
+    worker_connections      ${nginx.workerConnections};
+    use                     ${nginx.eventsUse};
+}
+
+http {
+    include                 /etc/nginx/mime.types;
+    default_type            application/octet-stream;
+
+    server_tokens off;
+    access_log              off;
+    keepalive_timeout       65;
+    proxy_read_timeout      200;
+    sendfile                on;
+    tcp_nopush              on;
+    tcp_nodelay             on;
+
+    gzip_static             on;
+    brotli                  on;
+    brotli_static           on;
+    brotli_types            application/atom+xml application/javascript application/json application/rss+xml
+                            application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype
+                            application/x-font-ttf application/x-javascript application/xhtml+xml application/xml
+                            font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon
+                            image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml application/wasm;
+
+
+    # Only retry if there was a communication error, not a timeout
+    # on the Node server (to avoid propagating "queries of death"
+    # to all frontends)
+    proxy_next_upstream     error;
+
+    #cache
+    proxy_cache_path        /var/cache/nginx levels=1:2 keys_zone=all:32m max_size=1g;
+
+    include                 /etc/nginx/conf.d/*.conf;
+}`;
+exports.default = (0, apply_overrides_1.default)('nginxConf', baseNginxTemplate);

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

@@ -8,6 +8,7 @@ const app_configs_1 = __importDefault(require("../configs/app-configs"));
 const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrides"));
 const installProductionCommand = (0, yarn_1.getInstallProductionCommand)();
 const yarnVersion = (0, yarn_1.getYarnVersion)();
+const { nginx } = app_configs_1.default;
 // В зависимости от используемого мендежера зависимостей для их установки нужно копировать разный набор файлов
 const filesRequiredToInstallDependencies = [
     'package.json',
@@ -20,12 +21,14 @@ const dockerfileTemplate = `
 FROM ${app_configs_1.default.baseDockerImage}
 ARG START_SH_LOCATION
 ARG NGINX_CONF_LOCATION
+ARG NGINX_BASE_CONF_LOCATION
 
 WORKDIR /src
 
 # Полу-статичные файлы, могут легко кешироваться
 ADD $START_SH_LOCATION /src/start.sh
 ADD $NGINX_CONF_LOCATION /src/nginx.conf
+${nginx ? 'ADD $NGINX_BASE_CONF_LOCATION /etc/nginx/nginx.conf' : ''}
 
 # Зависимости. При некоторой удаче могут кешироваться и соответственно кешировать установку зависимостей
 ${filesRequiredToInstallDependencies

package/build/templates/dockerfile.template.js

@@ -8,6 +8,7 @@ const apply_overrides_1 = __importDefault(require("../configs/util/apply-overrid
 const appPathToAdd = app_configs_1.configs.clientOnly ? app_configs_1.configs.buildPath : '.';
 const appTargetPath = app_configs_1.configs.clientOnly ? `/src/${app_configs_1.configs.buildPath}` : '/src';
 const nginxConfTargetLocation = app_configs_1.configs.clientOnly ? '/etc/nginx/conf.d/default.conf' : '/src/nginx.conf';
+const { nginx } = app_configs_1.configs;
 const nginxNonRootPart = app_configs_1.configs.runFromNonRootUser
     ? `RUN chown -R nginx:nginx /src && \\
        mkdir -p /var/lib/nginx && \\
@@ -24,10 +25,12 @@ const dockerfileTemplate = `
 FROM ${app_configs_1.configs.baseDockerImage}
 ARG START_SH_LOCATION
 ARG NGINX_CONF_LOCATION
+ARG NGINX_BASE_CONF_LOCATION
 
 WORKDIR /src
 ADD $START_SH_LOCATION /src/start.sh
 ADD $NGINX_CONF_LOCATION ${nginxConfTargetLocation}
+${nginx ? 'ADD $NGINX_BASE_CONF_LOCATION /etc/nginx/nginx.conf' : ''}
 
 ${nginxNonRootPart}