fix(arui-scripts): #156

core-ds · Nov 7, 2023 · 31f8827 · 31f8827
1 parent 8d7d7fe
commit 31f8827
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/packages/arui-scripts/src/commands/docker-build-compiled/index.ts b/packages/arui-scripts/src/commands/docker-build-compiled/index.ts
@@ -25,10 +25,9 @@ import exec from '../util/exec';
             startScriptTemplate: startScript,
             allowLocalDockerfile: false,
             allowLocalStartScript: false,
+            allowLocalDockerIgnore: true,
         });
 
-        await exec('echo "node_modules" >> .dockerignore');
-
         await exec(getDockerBuildCommand({ tempDirName, imageFullName }));
         await fs.remove(pathToTempDir);
 

diff --git a/packages/arui-scripts/src/commands/docker-build/index.ts b/packages/arui-scripts/src/commands/docker-build/index.ts
@@ -27,6 +27,7 @@ import { getPruningCommand } from '../util/yarn';
             startScriptTemplate: startScript,
             allowLocalDockerfile: true,
             allowLocalStartScript: true,
+            allowLocalDockerIgnore: false,
         });
 
         await fs.remove(configs.buildPath);

diff --git a/packages/arui-scripts/src/commands/util/docker-build.ts b/packages/arui-scripts/src/commands/util/docker-build.ts
@@ -52,6 +52,7 @@ type PrepareFilesForDockerParams = {
     pathToTempDir: string;
     allowLocalDockerfile: boolean;
     allowLocalStartScript: boolean;
+    allowLocalDockerIgnore: boolean;
 };
 
 export async function prepareFilesForDocker({
@@ -61,6 +62,7 @@ export async function prepareFilesForDocker({
     pathToTempDir,
     allowLocalDockerfile,
     allowLocalStartScript,
+    allowLocalDockerIgnore,
 }: PrepareFilesForDockerParams) {
     await fs.emptyDir(pathToTempDir);
 
@@ -78,13 +80,24 @@ export async function prepareFilesForDocker({
             ? await fs.readFile(configs.localStartScript, 'utf8')
             : startScriptTemplate;
 
+    const dockerIgnore =
+        allowLocalDockerIgnore &&
+        (configs.localDockerIgnore
+            ? await fs
+                  .readFile(configs.localDockerIgnore, 'utf8')
+                  .then((ignores) => `${ignores}\nnode_modules`)
+            : 'node_modules');
+
     await Promise.all([
         fs.writeFile(path.join(pathToTempDir, 'Dockerfile'), dockerfile, 'utf8'),
         fs.writeFile(path.join(pathToTempDir, 'nginx.conf'), nginxConf, 'utf8'),
         fs.writeFile(path.join(pathToTempDir, 'start.sh'), startScript, {
             encoding: 'utf8',
             mode: 0o555,
         }),
+        allowLocalDockerIgnore &&
+            configs.localDockerIgnore &&
+            fs.writeFile(configs.localDockerIgnore, dockerIgnore, 'utf-8'),
     ]);
 }
 

diff --git a/packages/arui-scripts/src/configs/app-configs/get-defaults.ts b/packages/arui-scripts/src/configs/app-configs/get-defaults.ts
@@ -103,6 +103,7 @@ export function getDefaultAppContext(): AppContext {
     const overridesPath = tryResolve(path.join(CWD, 'arui-scripts.overrides'));
     const nginxConfFilePath = path.join(CWD, 'nginx.conf');
     const dockerfileFilePath = path.join(CWD, 'Dockerfile');
+    const dockerIgnoreFilePath = path.join(CWD, '.dockerignore');
     const startScriptFilePath = path.join(CWD, 'start.sh');
 
     return {
@@ -127,6 +128,7 @@ export function getDefaultAppContext(): AppContext {
         localNginxConf: fs.existsSync(nginxConfFilePath) ? nginxConfFilePath : null,
         localDockerfile: fs.existsSync(dockerfileFilePath) ? dockerfileFilePath : null,
         localStartScript: fs.existsSync(startScriptFilePath) ? startScriptFilePath : null,
+        localDockerIgnore: fs.existsSync(dockerIgnoreFilePath) ? dockerIgnoreFilePath : null,
 
         // Эти пути зависят от других настроек, которые могут быть переопределены пользователем
         publicPath: '',

diff --git a/packages/arui-scripts/src/configs/app-configs/types.ts b/packages/arui-scripts/src/configs/app-configs/types.ts
@@ -115,6 +115,7 @@ export type AppContext = {
     tsconfig: string | null;
     localNginxConf: string | null;
     localDockerfile: string | null;
+    localDockerIgnore: string | null;
     localStartScript: string | null;
 
     overridesPath: string[];