sketch: Propagate host vs. runtime OS/WorkingDir/Hostname
If you have a bunch of sketch sessions, you need to know where they were
launched. The container hostnames (some random thing) and working dirs (always /app)
aren't very helpful, so we want to keep around both. I've updated the UI
to show them as well.
This commit chooses "Host" and "Runtime" as the names of the "Outside"
and "Inside" sketch. I'm open to suggestions for better names.
Co-Authored-By: sketch, but it did a so-so job
diff --git a/dockerimg/dockerimg.go b/dockerimg/dockerimg.go
index 01a7392..6043c23 100644
--- a/dockerimg/dockerimg.go
+++ b/dockerimg/dockerimg.go
@@ -67,6 +67,11 @@
// Sketch client public key.
SketchPubKey string
+
+ // Host information to pass to the container
+ HostHostname string
+ HostOS string
+ HostWorkingDir string
}
// LaunchContainer creates a docker container for a project, installs sketch and opens a connection to it.
@@ -223,7 +228,7 @@
return nil
}
out, logsErr := combinedOutput(ctx, "docker", "logs", cntrName)
- if err != nil {
+ if logsErr != nil {
return fmt.Errorf("%w; and docker logs failed: %s, %v", err, out, logsErr)
}
out = bytes.TrimSpace(out)
@@ -375,7 +380,11 @@
"-unsafe",
"-addr=:80",
"-session-id="+config.SessionID,
- "-git-username="+config.GitUsername, "-git-email="+config.GitEmail,
+ "-git-username="+config.GitUsername,
+ "-git-email="+config.GitEmail,
+ "-host-hostname="+config.HostHostname,
+ "-host-os="+config.HostOS,
+ "-host-working-dir="+config.HostWorkingDir,
)
if config.SkabandAddr != "" {
cmdArgs = append(cmdArgs, "-skaband-addr="+config.SkabandAddr)