feat: allow to specify different docker build context (#59)

* fix: avoid deprecated npm bin in tests
makeomatic · Mar 3, 2023 · 852916e · 852916e
1 parent e72877e
commit 852916e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/__tests__/install.spec.js b/__tests__/install.spec.js
@@ -289,9 +289,13 @@ describe('(pnpm) test installing the package', () => {
 
   describe('installs globally', () => {
     test('is able to install package globally', async () => {
-      const { stdout, stderr } = await execa('npm', ['bin', '--location=global'], { buffer: true });
-      await execa('pnpm', ['config', 'set', `global-bin-dir=${stdout}`]);
-      await execa('pnpm', ['-g', 'add', tarball]);
+      const { stdout, stderr } = await execa('npm', ['prefix', '--location=global'], { buffer: true });
+      const globalBinDir = `${stdout}/bin`;
+      await execa('pnpm', ['-g', 'add', tarball], {
+        env: {
+          PNPM_HOME: globalBinDir,
+        },
+      });
     }, 240000);
 
     test('returns current node version in module', async () => {

diff --git a/bin/cmds/docker.js b/bin/cmds/docker.js
@@ -34,6 +34,11 @@ exports.builder = (yargs) => (
       default: [],
       array: true,
     })
+    .option('docker_context', {
+      alias: 'c',
+      default: '.',
+      describe: 'docker build context path',
+    })
     .strict(false)
     .help()
 );

diff --git a/bin/cmds/docker_cmds/build.js b/bin/cmds/docker_cmds/build.js
@@ -41,15 +41,15 @@ exports.handler = (argv) => {
     `-f ${tmpDockerfile}`,
   ];
 
-  const { docker_build_args: dba } = argv;
+  const { docker_build_args: dba, docker_context: context } = argv;
   if (dba && typeof dba === 'object') {
     for (const [prop, value] of Object.entries(dba)) {
       args.push(`--build-arg ${prop}=${value}`);
     }
   }
 
   // start builder
-  const command = `${args.join(' ')} .`;
+  const command = `${args.join(' ')} ${context}`;
   echo(command);
   const build = exec(command);