Saving changes

Author: stuartpa

internal/container/controller.go

@@ -8,6 +8,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"fmt"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
@@ -308,7 +309,7 @@ func (c Controller) RunCmdInContainer(
 			AttachStderr: true,
 			AttachStdout: true,
 			Cmd:          cmd,
-			//Env:          []string{"DOTNET_ROOT=/root/.dotnet"},
+			Env:          options.Env,
 		},
 	)
 	checkErr(err)
@@ -338,6 +339,7 @@ func (c Controller) RunCmdInContainer(
 	stderr, err := io.ReadAll(&errBuf)
 	checkErr(err)
 
+	trace(fmt.Sprintf("Err: %v", err))
 	trace("Stdout: " + string(stdout))
 	trace("Stderr: " + string(stderr))
 

pkg/mssqlcontainer/ingest/location/local.go

@@ -3,6 +3,7 @@ package location
 import (
 	"github.com/microsoft/go-sqlcmd/internal/container"
 	"github.com/microsoft/go-sqlcmd/internal/io/file"
+	"path/filepath"
 )
 
 type local struct {
@@ -29,12 +30,17 @@ func (l local) CopyToContainer(containerId string, destFolder string) {
 		destFolder,
 	)
 
-	/*
-		_, filename := filepath.Split(l.uri)
+	_, filename := filepath.Split(l.uri)
 
-		l.controller.RunCmdInContainer(
-			containerId,
-			[]string{"chmod", "g+r", destFolder + "/" + filename},
-			container.ExecOptions{},
-		)*/
+	l.controller.RunCmdInContainer(
+		containerId,
+		[]string{"chown", "mssql:root", destFolder + "/" + filename},
+		container.ExecOptions{User: "root"},
+	)
+
+	l.controller.RunCmdInContainer(
+		containerId,
+		[]string{"chmod", "-o-r-u+rw-g+r", destFolder + "/" + filename},
+		container.ExecOptions{User: "root"},
+	)
 }

pkg/mssqlcontainer/ingest/mechanism/bacpac.go

@@ -37,7 +37,7 @@ func (m *bacpac) BringOnline(
 	m.setDefaultDatabaseToMaster(options.Username, query)
 
 	m.RunCommand([]string{
-		"./.dotnet/tools/sqlpackage",
+		"/home/mssql/.dotnet/tools/sqlpackage",
 		"/Diagnostics:true",
 		"/Action:import",
 		"/SourceFile:" + m.CopyToLocation() + "/" + options.Filename,
@@ -62,29 +62,35 @@ func (m *bacpac) installSqlPackage() {
 		panic("controller is nil")
 	}
 
-	//BUG(stuartpa): Can this be done in the mssql user, don't think it needs root
-	m.RunCommand([]string{"wget", "https://dot.net/v1/dotnet-install.sh", "-O", "/tmp/dotnet-install.sh"})
-	m.RunCommand([]string{"chmod", "+x", "/tmp/dotnet-install.sh"})
-	m.RunCommand([]string{"/tmp/dotnet-install.sh", "--install-dir", "/opt/dotnet"})
+	_, stderr := m.RunCommand([]string{"/opt/dotnet/dotnet", "--version"})
+	if len(stderr) > 0 {
+		m.RunCommand([]string{"wget", "https://dot.net/v1/dotnet-install.sh", "-O", "/tmp/dotnet-install.sh"})
+		m.RunCommand([]string{"chmod", "+x", "/tmp/dotnet-install.sh"})
+		m.RunCommand([]string{"/tmp/dotnet-install.sh", "--install-dir", "/opt/dotnet"})
 
-	// The SQL Server container doesn't have a /home/mssql directory (which is ~), this
-	// causes all sorts of things to break in the container that expect to create .toolname folders
-	m.RunCommandAsRoot([]string{"mkdir", "-p", "/home/mssql"})
-	m.RunCommandAsRoot([]string{"chown", "mssql:root", "/home/mssql"})
+		// The SQL Server container doesn't have a /home/mssql directory (which is ~), this
+		// causes all sorts of things to break in the container that expect to create .toolname folders
+		m.RunCommandAsRoot([]string{"mkdir", "-p", "/home/mssql"})
+		m.RunCommandAsRoot([]string{"chown", "mssql:root", "/home/mssql"})
 
-	m.RunCommand([]string{"touch", "/home/mssql/.bashrc"})
-	m.RunCommand([]string{"sed", "-i", "$ a/export DOTNET_ROOT=/opt/dotnet", "/home/mssql/.bashrc"})
-	m.RunCommand([]string{"sed", "-i", "$ a/export PATH=$PATH:$DOTNET_ROOT:~/.dotnet/tools", "/home/mssql/.bashrc"})
-	m.RunCommand([]string{"/opt/dotnet/dotnet", "tool", "install", "-g", "microsoft.sqlpackage"})
+		m.RunCommand([]string{"/bin/bash", "-c", "echo 'export DOTNET_ROOT=/opt/dotnet' > /home/mssql/.bashrc"})
+		m.RunCommand([]string{"/bin/bash", "-c", "echo 'export PATH=$PATH:$DOTNET_ROOT:/home/mssql/.dotnet/tools' >> /home/mssql/.bashrc"})
+	}
+
+	_, stderr = m.RunCommand([]string{"/home/mssql/.dotnet/tools/sqlpackage", "/version"})
+	if len(stderr) > 0 {
+		m.RunCommand([]string{"/opt/dotnet/dotnet", "tool", "install", "-g", "microsoft.sqlpackage"})
+	}
 }
 
 func (m *bacpac) RunCommand(s []string) ([]byte, []byte) {
-	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{})
+	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{
+		Env: []string{"DOTNET_ROOT=/opt/dotnet"},
+	})
 }
 
 func (m *bacpac) RunCommandAsRoot(s []string) ([]byte, []byte) {
 	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{
 		User: "root",
-		Env:  nil,
 	})
 }