add check dockerfile path

Author: imagine10255

README.md

@@ -79,6 +79,12 @@ package.json
 }
 ```
 
+### Test
+
+```bash
+ts-node lib/build-docker/node-run.ts
+```
+
 
 ## License
 

lib/build-docker/index.ts

@@ -10,6 +10,9 @@ import {CLIError} from '../script/cli';
 import logger from '../script/logger';
 import {initDefault} from '../config';
 import pushDocker from '../push-docker';
+import * as fs from 'fs';
+import Logger
+    from '../script/logger';
 
 const {Select} = require('enquirer');
 
@@ -18,23 +21,46 @@ interface IArgs {
     dockerfile?: string
 }
 
+interface IOptions {
+    publicUrl?: string
+}
+
+
+/**
+ * Object.keys 型別增強
+ * @param object
+ */
+export function objectKeys<T extends object>(object: T): Array<keyof T> {
+    return Object.keys(object) as Array<keyof T>;
+}
+
+
+
 
 function buildDockerImage(imageName: string, version: string, remoteAddress: string, dockerfile: string, publicUrl?: string): Promise<string> {
 
     return new Promise((resolve, reject) => {
-        const options = {
-            publicUrl: isEmpty(publicUrl) ? `PUBLIC_URL=${publicUrl}`: undefined,
+        const options: IOptions = {
+            publicUrl: isEmpty(publicUrl) ? undefined: `PUBLIC_URL=${publicUrl}`,
         };
-        const dockerBuildArgs = ['build', '-t', imageName, '-f', dockerfile, '--build-arg', options.publicUrl, '.']
+        const optionsLength = objectKeys(options).filter((key)=> typeof options[key] !== 'undefined').length;
+        const buildArgTag = optionsLength > 0 ? '--build-arg': undefined;
+
+        const dockerBuildArgs = ['build', '-t', imageName, '-f', dockerfile, buildArgTag, options.publicUrl, '.']
             .filter(arg => typeof arg !== 'undefined') as string[];
 
-        const loader = ora();
         logger.info(
             `Building ${chalk.dim(
                 `(using "docker ${dockerBuildArgs.join(' ')}")`,
             )}`
         );
 
+        // 檢查Docker存在
+        if (!fs.existsSync(dockerfile)) {
+            throw new Error('dockerfile not exists, please check your dockerfile path');
+        }
+
+        const loader = ora();
         const buildProcess = child_process.spawn('docker', dockerBuildArgs,{
             env: {
                 ...process.env,
@@ -94,24 +120,34 @@ async function run(args?: IArgs) {
 
     console.log(`ready release ${imageName}:${imageVersion} ...`);
 
-    // Build Image
-    const targetImageName = await buildDockerImage(imageName, imageVersion, remoteAddress, dockerfile, publicUrl);
+    try {
+        // Build Image
+        const targetImageName = await buildDockerImage(imageName, imageVersion, remoteAddress, dockerfile, publicUrl);
 
-    // By OSX Notice
-    bash(`osascript -e 'display notification "${targetImageName} done" with title "build done"'`);
+        // By OSX Notice
+        bash(`osascript -e 'display notification "${targetImageName} done" with title "build done"'`);
 
-    const prompt = new Select({
-        name: 'confirmPush',
-        message: 'do you want to push it?',
-        choices: [
-            {name: 'y', message: 'Yes'},
-            {name: 'n', message: 'No'},
-        ],
-    });
-    const confirmPush = await prompt.run();
-    if(confirmPush === 'y'){
-        pushDocker();
+        const prompt = new Select({
+            name: 'confirmPush',
+            message: 'do you want to push it?',
+            choices: [
+                {name: 'y', message: 'Yes'},
+                {name: 'n', message: 'No'},
+            ],
+        });
+        const confirmPush = await prompt.run();
+        if(confirmPush === 'y'){
+            pushDocker();
+        }
+
+    }catch (e: any){
+        if(e instanceof Error){
+            Logger.error(e.message);
+        }else{
+            console.log(e);
+        }
     }
+
 }
 
 export default run;

lib/build-docker/node-run.ts

@@ -1,4 +1,4 @@
 import buildDocker from './index';
 
 // $ ts-node lib/build-docker/node-run.ts
-buildDocker();
+buildDocker({dockerfile: './config/dockerfile/nest/Dockerfile'});

lib/index.ts

@@ -8,7 +8,7 @@ module.exports = async function bearScript () {
             return yargs
                 .positional('publicUrl', {
                     describe: 'react-script build public url (ex: /recommend)',
-                    default: 'undefined',
+                    default: '',
                 })
                 .positional('dockerfile', {
                     describe: 'custom dockerfile path (ex: ./)',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bear-node-docker",
-  "version": "2.2.5",
+  "version": "2.2.6-alpha.0",
   "description": "Common tools build docker image for node project development",
   "keywords": [
     "reactjs",