fix: capture the output for stdout of docker cp and date

Signed-off-by: Amin Yahyaabadi <[email protected]>
reproducible-containers · Mar 30, 2024 · a04f0ef · a04f0ef
1 parent a6ad893
commit a04f0ef
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/extract-cache.ts b/src/extract-cache.ts
@@ -5,7 +5,7 @@ import { run } from './run.js';
 
 async function extractCache(cacheSource: string, cacheTarget: string, scratchDir: string) {
     // Prepare Timestamp for Layer Cache Busting
-    const { stdout: date } = await run('date', ['--iso=ns']);
+    const { stdout: date } = await run('date', ['--iso=ns'], true);
     await fs.writeFile(path.join(scratchDir, 'buildstamp'), date);
 
     // Prepare Dancefile to Access Caches
@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=${cacheTarget} \
     await run('docker', ['create', '-ti', '--name', 'cache-container', 'dance:extract']);
 
     // Unpack Docker Image into Scratch
-    const { stdout: tarOutput } = await run('docker', ['cp', '-L', 'cache-container:/var/dance-cache', '-']);
+    const { stdout: tarOutput } = await run('docker', ['cp', '-L', 'cache-container:/var/dance-cache', '-'], true);
     await fs.writeFile(path.join(scratchDir, 'dance-cache.tar'), tarOutput);
     await run('tar', ['-H', 'posix', '-x', '-C', scratchDir, '-f', path.join(scratchDir, 'dance-cache.tar')]);
 

diff --git a/src/inject-cache.ts b/src/inject-cache.ts
@@ -12,7 +12,7 @@ async function injectCache(cacheSource: string, cacheTarget: string, scratchDir:
     await fs.mkdir(cacheSource, { recursive: true });
 
     // Prepare Timestamp for Layer Cache Busting
-    const { stdout: date } = await run('date', ['--iso=ns']);
+    const { stdout: date } = await run('date', ['--iso=ns'], true);
     await fs.writeFile(path.join(cacheSource, 'buildstamp'), date);
 
     // Prepare Dancefile to Access Caches

diff --git a/src/run.ts b/src/run.ts
@@ -1,8 +1,11 @@
 import spawn from 'spawn-please'
 
-export async function run(command: string, args: string[]) {
+export async function run(command: string, args: string[], captureOutput = true) {
     try {
-        return await spawn(command, args, {}, { stdout: 'inherit', stderr: 'inherit' });
+        const spawnOpts = captureOutput ?
+            { stdout: 'pipe', stderr: 'pipe', } :
+            { stdout: 'inherit', stderr: 'inherit' };
+        return await spawn(command, args, {}, spawnOpts);
     } catch (error) {
         console.error(`Error running command: ${command} ${args.join(' ')}`);
         throw error;