Fix vscdc build error (devcontainers#341)

Author: samruddhikhandale

build/src/push.js

@@ -26,8 +26,7 @@ async function push(repo, release, updateLatest, registry, registryPath, stubReg
     replaceImages = (configUtils.getVersionFromRelease(release, definitionId) == 'dev') || replaceImages;
 
     // Stage content
-    const stagingFolder = await configUtils.getStagingFolder(release);
-    await configUtils.loadConfig(stagingFolder);
+    let stagingFolder;
 
     // Use or create a buildx / buildkit "builder" that using the docker-container driver which internally 
     // uses QEMU to emulate different architectures for cross-platform builds. Setting up a separate
@@ -44,13 +43,19 @@ async function push(repo, release, updateLatest, registry, registryPath, stubReg
     if (definitionId) {
         const variants = configUtils.getVariants(definitionId) || [null];
         await asyncUtils.forEach(variants, async (variant) => {
+            stagingFolder = await configUtils.getStagingFolder(release);
+            await configUtils.loadConfig(stagingFolder);
+
             console.log(`**** Pushing ${definitionId}: ${variant} ${release} ****`);
             await pushImage(
                 definitionId, variant, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, secondaryRegistryPath);
         });
     } else {
         const definitionsToPush = configUtils.getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip);
         await asyncUtils.forEach(definitionsToPush, async (currentJob) => {
+            stagingFolder = await configUtils.getStagingFolder(release);
+            await configUtils.loadConfig(stagingFolder);
+
             console.log(`**** Pushing ${currentJob['id']}: ${currentJob['variant']} ${release} ****`);
             await pushImage(
                 currentJob['id'], currentJob['variant'] || null, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, secondaryRegistryPath);

build/src/utils/config.js

@@ -671,18 +671,16 @@ function getFallbackPoolUrl(package) {
 
 
 async function getStagingFolder(release) {
-    if (!stagingFolders[release]) {
-        const stagingFolder = path.join(os.tmpdir(), 'dev-containers', release);
-        console.log(`(*) Copying files to ${stagingFolder}\n`);
-        await asyncUtils.rimraf(stagingFolder); // Clean out folder if it exists
-        await asyncUtils.mkdirp(stagingFolder); // Create the folder
-        await asyncUtils.copyFiles(
-            path.resolve(__dirname, '..', '..', '..'),
-            getConfig('filesToStage'),
-            stagingFolder);
-        
-        stagingFolders[release] = stagingFolder;
-    }
+    const stagingFolder = path.join(os.tmpdir(), 'dev-containers', release);
+    console.log(`(*) Copying files to ${stagingFolder}\n`);
+    await asyncUtils.rimraf(stagingFolder); // Clean out folder if it exists
+    await asyncUtils.mkdirp(stagingFolder); // Create the folder
+    await asyncUtils.copyFiles(
+        path.resolve(__dirname, '..', '..', '..'),
+        getConfig('filesToStage'),
+        stagingFolder);
+    
+    stagingFolders[release] = stagingFolder;
     return stagingFolders[release];
 }