Merge branch 'main' into dependabot/go_modules/enclave-manager/server…

…/golang.org/x/net-0.17.0
kurtosis-tech · Oct 24, 2023 · 6a962a0 · 6a962a0
2 parents 9a716af + 4b75980
commit 6a962a0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/engine/frontend/src/component/ServiceView.js b/engine/frontend/src/component/ServiceView.js
@@ -65,7 +65,7 @@ const ServiceView = (service) => {
                 <Tbody>
                     {tableRow("Name", () => serviceInfo.name)}
                     {tableRow("UUID", () => <pre>{serviceInfo.serviceUuid}</pre>)}
-                    {tableRow("Status", () => statusBadge(serviceInfo.serviceStatus))}
+                    {tableRow("Status", () => statusBadge(serviceInfo.container.status))}
                     {tableRow("Image", () => serviceInfo.container.imageName)}
                     {tableRow("Ports", () => codeBox(serviceInfo.shortenedUuid, serviceInfo.name, "ports", serviceInfo.ports, 0))}
                     {tableRow("ENTRYPOINT", () => codeBox(serviceInfo.shortenedUuid, serviceInfo.name, "entrypoint", serviceInfo.container.entrypointArgs, 1))}

diff --git a/engine/server/webapp/asset-manifest.json b/engine/server/webapp/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
     "main.css": "./static/css/main.2cce5778.css",
-    "main.js": "./static/js/main.01e8fa76.js",
+    "main.js": "./static/js/main.8ed2cf3c.js",
     "index.html": "./index.html",
     "main.2cce5778.css.map": "./static/css/main.2cce5778.css.map",
-    "main.01e8fa76.js.map": "./static/js/main.01e8fa76.js.map"
+    "main.8ed2cf3c.js.map": "./static/js/main.8ed2cf3c.js.map"
   },
   "entrypoints": [
     "static/css/main.2cce5778.css",
-    "static/js/main.01e8fa76.js"
+    "static/js/main.8ed2cf3c.js"
   ]
 }
diff --git a/engine/server/webapp/index.html b/engine/server/webapp/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.01e8fa76.js"></script><link href="./static/css/main.2cce5778.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.8ed2cf3c.js"></script><link href="./static/css/main.2cce5778.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/.../server/webapp/static/js/main.01e8fa76.js → .../server/webapp/static/js/main.8ed2cf3c.js b/.../server/webapp/static/js/main.01e8fa76.js → .../server/webapp/static/js/main.8ed2cf3c.js
diff --git a/...pp/static/js/main.01e8fa76.js.LICENSE.txt → ...pp/static/js/main.8ed2cf3c.js.LICENSE.txt b/...pp/static/js/main.01e8fa76.js.LICENSE.txt → ...pp/static/js/main.8ed2cf3c.js.LICENSE.txt
diff --git a/...ver/webapp/static/js/main.01e8fa76.js.map → ...ver/webapp/static/js/main.8ed2cf3c.js.map b/...ver/webapp/static/js/main.01e8fa76.js.map → ...ver/webapp/static/js/main.8ed2cf3c.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.01e8fa76.js"></script><link href="./static/css/main.2cce5778.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.8ed2cf3c.js"></script><link href="./static/css/main.2cce5778.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>