Merge pull request #59 from oracle/update-third-party-packages

updating third-party packages

Author: robertpatrick

electron/app/js/imageBuilderUtils.js

@@ -142,11 +142,29 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts) {
     PATH: process.env.PATH
   };
 
-  // podman-specific environment variable
+  // Docker-specific environment variables that should be passed on
+  if (process.env.DOCKER_HOST) {
+    env['DOCKER_HOST'] = process.env.DOCKER_HOST;
+  }
+  if (process.env.DOCKER_TLS_VERIFY) {
+    env['DOCKER_TLS_VERIFY'] = process.env.DOCKER_TLS_VERIFY;
+  }
+  if (process.env.DOCKER_CERT_PATH) {
+    env['DOCKER_CERT_PATH'] = process.env.DOCKER_CERT_PATH;
+  }
+
+  // podman-specific environment variables that should be passed on
+  if(process.env.CONTAINER_HOST) {
+    env['CONTAINER_HOST'] = process.env.CONTAINER_HOST;
+  }
   if (process.env.STORAGE_DRIVER) {
     env['STORAGE_DRIVER'] = process.env.STORAGE_DRIVER;
   }
+  if (process.env.STORAGE_OPTS) {
+    env['STORAGE_OPTS'] = process.env.STORAGE_OPTS;
+  }
 
+  // proxy-related environment variables
   if (httpsProxyUrl) {
     env['HTTPS_PROXY'] = httpsProxyUrl;
     env['https_proxy'] = httpsProxyUrl;

electron/app/js/project.js

@@ -356,6 +356,14 @@ async function _openProjectFile(targetWindow, projectFileName) {
 }
 
 async function _saveProjectFile(targetWindow, projectFile, projectContents) {
+  // Just in case the name or uuid were empty, make sure that they have a proper value.
+  if (!projectContents.name) {
+    projectContents.name = _generateProjectName(projectFile);
+  }
+  if (!projectContents.uuid) {
+    projectContents.uuid = _generateProjectUuid();
+  }
+
   return new Promise((resolve, reject) => {
     _getCredentialManagerForSavingProject(targetWindow, projectContents)
       .then(credentialManager => {

electron/app/locales/en/webui.json

@@ -1009,7 +1009,7 @@
   "wko-uninstaller-remove-namespace-in-progress": "Removing Kubernetes namespace {{namespace}}",
   "wko-uninstaller-uninstall-complete-title": "WebLogic Kubernetes Operator Uninstall Complete",
   "wko-uninstaller-uninstall-complete-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled from Kubernetes namespace {{operatorNamespace}}.",
-  "wko-uninstaller-uninstall-complete-with-namespace-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled and Kubernetes namespace {{operatorNamespace}} was deleted.",
+  "wko-uninstaller-uninstall-with-namespace-complete-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled and Kubernetes namespace {{operatorNamespace}} was deleted.",
   "wko-uninstaller-uninstall-failed-title": "WebLogic Kubernetes Operator Uninstall Failed",
   "wko-uninstaller-uninstall-failed-error-message":"Unable to uninstall WebLogic Kubernetes Operator {{operatorName}} from Kubernetes namespace {{operatorNamespace}}: {{error}}.",
   "wko-uninstaller-uninstall-catch-all-error-message": "WebLogic Kubernetes Operator uninstall failed with an unexpected error: {{error}}",