more environment variable-related changes for podman

Author: robertpatrick

electron/app/js/imageBuilderUtils.js

@@ -142,11 +142,18 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts) {
     PATH: process.env.PATH
   };
 
+  // podman-specific environment variable
+  if (process.env.STORAGE_DRIVER) {
+    env['STORAGE_DRIVER'] = process.env.STORAGE_DRIVER;
+  }
+
   if (httpsProxyUrl) {
     env['HTTPS_PROXY'] = httpsProxyUrl;
+    env['https_proxy'] = httpsProxyUrl;
   }
   if (bypassProxyHosts) {
     env['NO_PROXY'] = bypassProxyHosts;
+    env['no_proxy'] = bypassProxyHosts;
   }
 
   if (!osUtils.isWindows()) {
@@ -161,6 +168,7 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts) {
 module.exports = {
   doLogin,
   doPushImage,
+  getDockerEnv,
   validateImageBuilderExecutable,
   validateImageExistsLocally
 };

electron/app/js/witCreate.js

@@ -11,27 +11,15 @@ const { getLogger } = require('./wktLogging');
 const { getImagetoolShellScript } = require('./wktTools');
 const { getHttpsProxyUrl, getBypassProxyHosts } = require('./userSettings');
 const { executeChildShellScript } = require('./childProcessExecutor');
+const { getDockerEnv } = require('./imageBuilderUtils');
 
 async function createImage(currentWindow, stdoutChannel, stderrChannel, createConfig) {
   const httpsProxyUrl = getHttpsProxyUrl();
   const bypassProxyHosts = getBypassProxyHosts();
 
   const imageToolScript = getImagetoolShellScript();
   const [ args, argsContainCredentials ] = buildArgumentsListForCreate(createConfig, httpsProxyUrl);
-  const env = {
-    JAVA_HOME: createConfig.javaHome,
-    DOCKER_BUILDKIT: '0',
-    WLSIMG_BLDDIR: app.getPath('temp')
-  };
-  // imagetool only honors the lower-cased versions of these variables...
-  if (httpsProxyUrl) {
-    env['HTTPS_PROXY'] = httpsProxyUrl;
-    env['https_proxy'] = httpsProxyUrl;
-  }
-  if (bypassProxyHosts) {
-    env['NO_PROXY'] = bypassProxyHosts;
-    env['no_proxy'] = bypassProxyHosts;
-  }
+  const env = getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts);
 
   const result = {
     isSuccess: true
@@ -64,18 +52,7 @@ async function createAuxImage(currentWindow, stdoutChannel, stderrChannel, creat
 
   const imageToolScript = getImagetoolShellScript();
   const args = buildArgumentsListForCreateAuxImage(createConfig, httpsProxyUrl);
-  const env = {
-    JAVA_HOME: createConfig.javaHome,
-    DOCKER_BUILDKIT: '0',
-    WLSIMG_BLDDIR: app.getPath('temp')
-  };
-  if (httpsProxyUrl) {
-    env['HTTPS_PROXY'] = httpsProxyUrl;
-  }
-  if (bypassProxyHosts) {
-    env['NO_PROXY'] = bypassProxyHosts;
-  }
-
+  const env = getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts);
   const result = {
     isSuccess: true
   };
@@ -98,6 +75,13 @@ async function createAuxImage(currentWindow, stdoutChannel, stderrChannel, creat
   });
 }
 
+function getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts) {
+  const env = getDockerEnv(httpsProxyUrl, bypassProxyHosts);
+  env['JAVA_HOME'] = createConfig.javaHome;
+  env['WLSIMG_BLDDIR'] = app.getPath('temp');
+  return env;
+}
+
 function buildArgumentsListForCreate(createConfig, httpsProxyUrl) {
   const args = [ 'create' ];
 

electron/app/js/witInspect.js

@@ -5,12 +5,14 @@
  */
 'use strict';
 
+const { app } = require('electron');
 const i18n = require('./i18next.config');
 const { executeScriptCommand } = require('./childProcessExecutor');
 const userSettings = require('./userSettings');
 const { getImagetoolShellScript } = require('./wktTools');
 const { getLogger } = require('./wktLogging');
 const { getErrorMessage } = require('./errorUtils');
+const { getDockerEnv } = require('./imageBuilderUtils');
 
 async function inspectImage(imageTag, options) {
   const inspectResults = {
@@ -42,9 +44,7 @@ async function callImageToolInspect(javaHome, imageTag, options) {
   const bypassProxyHosts = userSettings.getBypassProxyHosts();
 
   return new Promise((resolve, reject) => {
-    const env = { JAVA_HOME: javaHome };
-    getProxyEnvironment(env, options, httpsProxyUrl, bypassProxyHosts);
-
+    const env = getInspectEnvironment(javaHome, options, httpsProxyUrl, bypassProxyHosts);
     const scriptName = getImagetoolShellScript();
     const args = getImageToolInspectArgs(imageTag, options);
     executeScriptCommand(scriptName, args, env).then(results => {
@@ -53,18 +53,14 @@ async function callImageToolInspect(javaHome, imageTag, options) {
   });
 }
 
-function getProxyEnvironment(env, options, httpsProxyUrl, bypassProxyHosts) {
-  if (options && 'useProxy' in options && options.useProxy) {
-    if (httpsProxyUrl) {
-      env['HTTPS_PROXY'] = httpsProxyUrl;
-    } else {
-      throw new Error('Image tool inspection called with useProxy option but user settings has no proxy URL set.');
-    }
-
-    if (bypassProxyHosts) {
-      env['NO_POXY'] = bypassProxyHosts;
-    }
+function getInspectEnvironment(javaHome, options, httpsProxyUrl, bypassProxyHosts) {
+  if (options && 'useProxy' in options && options.useProxy && !httpsProxyUrl) {
+    throw new Error('Image tool inspection called with useProxy option but user settings has no proxy URL set.');
   }
+  const env = getDockerEnv(httpsProxyUrl, bypassProxyHosts);
+  env['JAVA_HOME'] = javaHome;
+  env['WLSIMG_BLDDIR'] = app.getPath('temp');
+  return env;
 }
 
 function getImageToolInspectArgs(imageTag, options) {