arui-scripts 18.4.0 → 18.5.0

package/.turbo/turbo-lint.log

@@ -49,8 +49,8 @@
   32:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/app-configs/types.ts
-   98:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
-  121:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  105:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  128:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/babel-client.ts
   69:8  warning  Prefer named exports  import/no-default-export
@@ -107,9 +107,9 @@
    28:18  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
    29:24  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
    36:14  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   49:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-  127:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-  150:8   warning  Prefer named exports                                               import/no-default-export
+   50:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+  128:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+  151:8   warning  Prefer named exports                                               import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/check-node-version.ts
   7:8  warning  Prefer named exports  import/no-default-export
@@ -151,12 +151,15 @@
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/plugins/postcss-prefix-selector.ts
   40:79  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
+/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/base-nginx.conf.template.ts
+  62:8  warning  Prefer named exports  import/no-default-export
+
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/dockerfile-compiled.template.ts
    2:8  warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
-  48:8  warning  Prefer named exports                                            import/no-default-export
+  52:8  warning  Prefer named exports                                            import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/dockerfile.template.ts
-  37:8  warning  Prefer named exports  import/no-default-export
+  40:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/templates/nginx.conf.template.ts
   36:8  warning  Prefer named exports  import/no-default-export
@@ -167,6 +170,6 @@
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/types.d.ts
   4:12  warning  Prefer named exports  import/no-default-export
 
-✖ 76 problems (0 errors, 76 warnings)
+✖ 77 problems (0 errors, 77 warnings)
   0 errors and 2 warnings potentially fixable with the `--fix` option.
 

package/.turbo/turbo-test.log

@@ -5,20 +5,20 @@ ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested wi
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (33.169 s)
+PASS src/configs/util/__tests__/get-polyfills.tests.ts (22 s)
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
-PASS src/configs/util/__tests__/get-polyfills.tests.ts (34.718 s)
-PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (23.524 s)
 PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
+PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
 Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
-PASS src/configs/util/__tests__/find-plugin.tests.ts (43.016 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (28.952 s)
 
 Test Suites: 7 passed, 7 total
 Tests:       21 passed, 21 total
 Snapshots:   0 total
-Time:        44.555 s
+Time:        30.509 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 18.5.0
+
+### Minor Changes
+
+-   [#286](https://github.com/core-ds/arui-scripts/pull/286) [`d003647`](https://github.com/core-ds/arui-scripts/commit/d00364743ab9a11e11393841b31a5ead2fd12b2f) Thanks [@makdv](https://github.com/makdv)! - #### Добавлена возможность перезаписывать некоторые параметры для базового конфига nginx (/etc/nginx/nginx.conf).
+
+    Пример добавления нового свойства `nginx` (в примере указаны значения, которые и так будут использованы по-умолчанию)
+
+    ```json
+    "aruiScripts": {
+        "nginx": {
+            "workerProcesses": 2,
+            "workerRlimitNoFile": 20000,
+            "workerConnections": 19000,
+            "eventsUse": "epoll",
+            "daemon": "off"
+        }
+    }
+    ```
+
 ## 18.4.0
 
 ### Minor Changes

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

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const base_nginx_conf_template_1 = __importDefault(require("../../templates/base-nginx.conf.template"));
 const dockerfile_template_1 = __importDefault(require("../../templates/dockerfile.template"));
 const nginx_conf_template_1 = __importDefault(require("../../templates/nginx.conf.template"));
 const start_template_1 = __importDefault(require("../../templates/start.template"));
@@ -30,6 +31,7 @@ const yarn_1 = require("../util/yarn");
             pathToTempDir,
             dockerfileTemplate: dockerfile_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
+            nginxBaseConfTemplate: base_nginx_conf_template_1.default,
             startScriptTemplate: start_template_1.default,
             allowLocalDockerfile: true,
             allowLocalStartScript: true,

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

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const base_nginx_conf_template_1 = __importDefault(require("../../templates/base-nginx.conf.template"));
 const dockerfile_compiled_template_1 = __importDefault(require("../../templates/dockerfile-compiled.template"));
 const nginx_conf_template_1 = __importDefault(require("../../templates/nginx.conf.template"));
 const start_template_1 = __importDefault(require("../../templates/start.template"));
@@ -28,6 +29,7 @@ const exec_1 = __importDefault(require("../util/exec"));
             pathToTempDir,
             dockerfileTemplate: dockerfile_compiled_template_1.default,
             nginxConfTemplate: nginx_conf_template_1.default,
+            nginxBaseConfTemplate: base_nginx_conf_template_1.default,
             startScriptTemplate: start_template_1.default,
             allowLocalDockerfile: false,
             allowLocalStartScript: false,

package/build/commands/util/docker-build.d.ts

@@ -6,13 +6,14 @@ export declare function getBuildParamsFromArgs(): {
 type PrepareFilesForDockerParams = {
     dockerfileTemplate: string;
     nginxConfTemplate: string;
+    nginxBaseConfTemplate: string;
     startScriptTemplate: string;
     pathToTempDir: string;
     allowLocalDockerfile: boolean;
     allowLocalStartScript: boolean;
     addNodeModulesToDockerIgnore: boolean;
 };
-export declare function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript, addNodeModulesToDockerIgnore, }: PrepareFilesForDockerParams): Promise<void>;
+export declare function prepareFilesForDocker({ dockerfileTemplate, nginxConfTemplate, nginxBaseConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript, addNodeModulesToDockerIgnore, }: PrepareFilesForDockerParams): Promise<void>;
 export declare function dockerVersionSatisfies(request: string): boolean;
 type DockerBuildCommandParams = {
     tempDirName: string;

package/build/commands/util/docker-build.js

@@ -21,6 +21,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
 const shelljs_1 = __importDefault(require("shelljs"));
 const app_configs_1 = __importDefault(require("../../configs/app-configs"));
+const get_defaults_1 = require("../../configs/app-configs/get-defaults");
 function getBuildParamsFromArgs() {
     let imageVersion = app_configs_1.default.version;
     let imageName = app_configs_1.default.name;
@@ -54,8 +55,14 @@ function getBuildParamsFromArgs() {
     };
 }
 function prepareFilesForDocker(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ dockerfileTemplate, nginxConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript, addNodeModulesToDockerIgnore, }) {
+    return __awaiter(this, arguments, void 0, function* ({ dockerfileTemplate, nginxConfTemplate, nginxBaseConfTemplate, startScriptTemplate, pathToTempDir, allowLocalDockerfile, allowLocalStartScript, addNodeModulesToDockerIgnore, }) {
         yield fs_extra_1.default.emptyDir(pathToTempDir);
+        let nginxBaseConf = '';
+        if (app_configs_1.default.nginx) {
+            nginxBaseConf = app_configs_1.default.localNginxBaseConf
+                ? yield fs_extra_1.default.readFile(app_configs_1.default.localNginxBaseConf, 'utf8')
+                : nginxBaseConfTemplate;
+        }
         const nginxConf = app_configs_1.default.localNginxConf
             ? yield fs_extra_1.default.readFile(app_configs_1.default.localNginxConf, 'utf8')
             : nginxConfTemplate;
@@ -70,7 +77,9 @@ function prepareFilesForDocker(_a) {
             (yield getAndModifyDockerIgnoreContent(dockerIgnoreFilePath));
         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, get_defaults_1.nginxConfigFileName), nginxConf, 'utf8'),
+            nginxBaseConf &&
+                fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, get_defaults_1.baseNginxConfigFileName), nginxBaseConf, 'utf8'),
             fs_extra_1.default.writeFile(path_1.default.join(pathToTempDir, 'start.sh'), startScript, {
                 encoding: 'utf8',
                 mode: 0o555,
@@ -78,7 +87,7 @@ function prepareFilesForDocker(_a) {
             addNodeModulesToDockerIgnore &&
                 dockerIgnoreFileContent &&
                 fs_extra_1.default.writeFile(dockerIgnoreFilePath, dockerIgnoreFileContent, 'utf-8'),
-        ]);
+        ].filter(Boolean));
     });
 }
 function dockerVersionSatisfies(request) {
@@ -88,7 +97,8 @@ function dockerVersionSatisfies(request) {
     const dockerClientVersion = shelljs_1.default.exec("docker version --format '{{.Client.Version}}'", {
         silent: true,
     });
-    return (0, satisfies_1.default)(dockerServerVersion.toString(), request) && (0, satisfies_1.default)(dockerClientVersion.toString(), request);
+    return ((0, satisfies_1.default)(dockerServerVersion.toString(), request) &&
+        (0, satisfies_1.default)(dockerClientVersion.toString(), request));
 }
 function getDockerBuildCommand({ tempDirName, imageFullName }) {
     // если пытаться собрать проект на маках с m1, докер будет пытаться вытянуть базовый образ под свою платформу и
@@ -97,7 +107,12 @@ function getDockerBuildCommand({ tempDirName, imageFullName }) {
     // Соответственно они будут падать при наличии этого флага.
     // https://docs.docker.com/engine/release-notes/20.10/
     const canUsePlatformFlag = dockerVersionSatisfies('>=20.10.21');
-    return `docker build ${canUsePlatformFlag ? '--platform linux/x86_64' : ''} -f "./${tempDirName}/Dockerfile" --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" --build-arg NGINX_CONF_LOCATION="./${tempDirName}/nginx.conf" -t ${imageFullName} .`;
+    return `docker build ${canUsePlatformFlag ? '--platform linux/x86_64' : ''} \
+    -f "./${tempDirName}/Dockerfile" \
+    --build-arg START_SH_LOCATION="./${tempDirName}/start.sh" \
+    --build-arg NGINX_CONF_LOCATION="./${tempDirName}/${get_defaults_1.nginxConfigFileName}" \
+    --build-arg NGINX_BASE_CONF_LOCATION="./${tempDirName}/${get_defaults_1.baseNginxConfigFileName}" \
+    -t ${imageFullName} .`;
 }
 function getAndModifyDockerIgnoreContent(dockerIgnoreFilePath) {
     return __awaiter(this, void 0, void 0, function* () {

package/build/configs/app-configs/get-defaults.d.ts

@@ -1,3 +1,5 @@
 import { AppConfigs, AppContext } from './types';
+export declare const nginxConfigFileName = "nginx.conf";
+export declare const baseNginxConfigFileName = "base-nginx.conf";
 export declare function getDefaultAppConfig(): AppConfigs;
 export declare function getDefaultAppContext(): AppContext;

package/build/configs/app-configs/get-defaults.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseNginxConfigFileName = exports.nginxConfigFileName = void 0;
 exports.getDefaultAppConfig = getDefaultAppConfig;
 exports.getDefaultAppContext = getDefaultAppContext;
 const fs_1 = __importDefault(require("fs"));
@@ -11,6 +12,8 @@ const resolve_1 = require("../util/resolve");
 const read_config_file_1 = require("./read-config-file");
 const CWD = process.cwd();
 const absoluteSrcPath = path_1.default.resolve(CWD, 'src');
+exports.nginxConfigFileName = 'nginx.conf';
+exports.baseNginxConfigFileName = 'base-nginx.conf';
 function getDefaultAppConfig() {
     var _a;
     const appPackage = getPackageJson();
@@ -39,6 +42,7 @@ function getDefaultAppConfig() {
         dockerRegistry: '',
         baseDockerImage: 'alfabankui/arui-scripts:16.20.2-slim',
         nginxRootPath: '/src',
+        nginx: null,
         runFromNonRootUser: true,
         removeDevDependenciesDuringDockerBuild: true,
         // archive compilation configs
@@ -97,7 +101,8 @@ function getDefaultAppContext() {
     const projectTsConfigPath = path_1.default.join(CWD, 'tsconfig.json');
     const yarnLockFilePath = path_1.default.join(CWD, 'yarn.lock');
     const overridesPath = (0, resolve_1.tryResolve)(path_1.default.join(CWD, 'arui-scripts.overrides'));
-    const nginxConfFilePath = path_1.default.join(CWD, 'nginx.conf');
+    const nginxConfFilePath = path_1.default.join(CWD, exports.nginxConfigFileName);
+    const nginxBaseConfFilePath = path_1.default.join(CWD, exports.baseNginxConfigFileName);
     const dockerfileFilePath = path_1.default.join(CWD, 'Dockerfile');
     const startScriptFilePath = path_1.default.join(CWD, 'start.sh');
     return {
@@ -117,6 +122,7 @@ function getDefaultAppContext() {
         // compilation configs locations
         tsconfig: fs_1.default.existsSync(projectTsConfigPath) ? projectTsConfigPath : null,
         localNginxConf: fs_1.default.existsSync(nginxConfFilePath) ? nginxConfFilePath : null,
+        localNginxBaseConf: fs_1.default.existsSync(nginxBaseConfFilePath) ? nginxBaseConfFilePath : null,
         localDockerfile: fs_1.default.existsSync(dockerfileFilePath) ? dockerfileFilePath : null,
         localStartScript: fs_1.default.existsSync(startScriptFilePath) ? startScriptFilePath : null,
         // Эти пути зависят от других настроек, которые могут быть переопределены пользователем

package/build/configs/app-configs/types.d.ts

@@ -25,6 +25,13 @@ export type AppConfigs = {
     dockerRegistry: string;
     baseDockerImage: string;
     nginxRootPath: string;
+    nginx: {
+        workerProcesses?: number;
+        workerRlimitNoFile?: number;
+        workerConnections?: number;
+        eventsUse?: string;
+        daemon?: string;
+    } | null;
     runFromNonRootUser: boolean;
     removeDevDependenciesDuringDockerBuild: boolean;
     archiveName: string;
@@ -111,6 +118,7 @@ export type AppContext = {
     useYarn: boolean;
     tsconfig: string | null;
     localNginxConf: string | null;
+    localNginxBaseConf: string | null;
     localDockerfile: string | null;
     localStartScript: string | null;
     overridesPath: string[];

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

@@ -31,6 +31,7 @@ type Overrides = {
     Dockerfile: string;
     DockerfileCompiled: string;
     nginx: string;
+    nginxConf: string;
     'start.sh': string;
     serverExternalsExemptions: Array<string | RegExp>;
     html: string;

package/build/templates/base-nginx.conf.template.d.ts

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

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}