Merge branch '403-inside-container' into 'master'

fix(engine): detect if DLE is running in a Docker container (#403)

See merge request postgres-ai/database-lab!571

Author: agneum

engine/go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/google/go-github/v34 v34.0.0
+	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/jackc/pgtype v1.5.0
@@ -47,7 +48,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.7.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect

engine/internal/diagnostic/logs.go

@@ -249,8 +249,9 @@ func extractTar(dir string, reader *tar.Reader, header *tar.Header) error {
 		}
 
 		defer func() {
-			err = f.Close()
-			log.Err("Failed to close TAR stream", err)
+			if err := f.Close(); err != nil {
+				log.Err("Failed to close TAR stream", err)
+			}
 		}()
 
 		if _, err := io.Copy(f, reader); err != nil {

engine/internal/retrieval/engine/postgres/tools/tools.go

@@ -134,7 +134,7 @@ func AddVolumesToHostConfig(ctx context.Context, docker *client.Client, hostConf
 
 	log.Dbg("Virtualization system: ", hostInfo.VirtualizationSystem)
 
-	if hostInfo.VirtualizationRole == "guest" {
+	if IsInDocker() {
 		inspection, err := docker.ContainerInspect(ctx, hostInfo.Hostname)
 		if err != nil {
 			return err
@@ -632,3 +632,12 @@ func CopyContainerLogs(ctx context.Context, docker *client.Client, containerName
 
 	return nil
 }
+
+// IsInDocker checks if the DLE process is running inside Docker container.
+func IsInDocker() bool {
+	if _, err := os.Stat("/.dockerenv"); err == nil {
+		return true
+	}
+
+	return false
+}