Saving changes

Author: stuartpa

internal/container/controller.go

@@ -273,7 +273,7 @@ func (c Controller) DownloadFile(id string, src string, destFolder string) {
 	}
 
 	cmd := []string{"mkdir", "-p", destFolder}
-	c.RunCmdInContainer(id, cmd)
+	c.RunCmdInContainer(id, cmd, ExecOptions{})
 
 	_, file := filepath.Split(src)
 
@@ -285,21 +285,30 @@ func (c Controller) DownloadFile(id string, src string, destFolder string) {
 		src,
 	}
 
-	c.RunCmdInContainer(id, cmd)
+	c.RunCmdInContainer(id, cmd, ExecOptions{})
 }
 
-func (c Controller) RunCmdInContainer(id string, cmd []string) ([]byte, []byte) {
+type ExecOptions struct {
+	User string
+	Env  []string
+}
+
+func (c Controller) RunCmdInContainer(
+	id string,
+	cmd []string,
+	options ExecOptions,
+) ([]byte, []byte) {
 	trace("Running command in container: " + strings.Join(cmd, " "))
 
 	response, err := c.cli.ContainerExecCreate(
 		context.Background(),
 		id,
 		types.ExecConfig{
-			User:         "root",
+			User:         options.User,
 			AttachStderr: true,
 			AttachStdout: true,
 			Cmd:          cmd,
-			Env:          []string{"DOTNET_ROOT=/root/.dotnet"},
+			//Env:          []string{"DOTNET_ROOT=/root/.dotnet"},
 		},
 	)
 	checkErr(err)

pkg/mssqlcontainer/ingest/extract/7zip.go

@@ -32,15 +32,15 @@ func (e *sevenZip) Extract(srcFile string, destFolder string) (string, string) {
 		"-aoa",
 		"-o" + destFolder,
 		"/var/opt/mssql/backup/" + srcFile,
-	})
+	}, container.ExecOptions{})
 
 	stdout, _ := e.controller.RunCmdInContainer(e.containerId, []string{
 		"./opt/7-zip/7zz",
 		"l",
 		"-ba",
 		"-slt",
 		"/var/opt/mssql/backup/" + srcFile,
-	})
+	}, container.ExecOptions{})
 
 	var mdfFile string
 	var ldfFile string
@@ -62,27 +62,27 @@ func (e *sevenZip) Extract(srcFile string, destFolder string) (string, string) {
 func (e *sevenZip) Install() {
 	e.controller.RunCmdInContainer(e.containerId, []string{
 		"mkdir",
-		"/opt/7-zip"})
+		"/opt/7-zip"}, container.ExecOptions{})
 
 	e.controller.RunCmdInContainer(e.containerId, []string{
 		"wget",
 		"-O",
 		"/opt/7-zip/7-zip.tar",
-		"https://7-zip.org/a/7z2201-linux-x64.tar.xz"})
+		"https://7-zip.org/a/7z2201-linux-x64.tar.xz"}, container.ExecOptions{})
 
 	e.controller.RunCmdInContainer(e.containerId, []string{
 		"tar",
 		"xvf",
 		"/opt/7-zip/7-zip.tar",
 		"-C",
 		"/opt/7-zip",
-	})
+	}, container.ExecOptions{})
 
 	e.controller.RunCmdInContainer(e.containerId, []string{
 		"chmod",
 		"u+x",
 		"/opt/7-zip/7zz",
-	})
+	}, container.ExecOptions{})
 }
 
 func extractPaths(input string) []string {

pkg/mssqlcontainer/ingest/location/local.go

@@ -3,7 +3,6 @@ package location
 import (
 	"github.com/microsoft/go-sqlcmd/internal/container"
 	"github.com/microsoft/go-sqlcmd/internal/io/file"
-	"path/filepath"
 )
 
 type local struct {
@@ -30,10 +29,12 @@ 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},
-	)
+		l.controller.RunCmdInContainer(
+			containerId,
+			[]string{"chmod", "g+r", destFolder + "/" + filename},
+			container.ExecOptions{},
+		)*/
 }

pkg/mssqlcontainer/ingest/mechanism/attach.go

@@ -64,5 +64,5 @@ func (m *attach) setFilePermissions(filename string) {
 }
 
 func (m *attach) RunCommand(s []string) ([]byte, []byte) {
-	return m.controller.RunCmdInContainer(m.containerId, s)
+	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{})
 }

pkg/mssqlcontainer/ingest/mechanism/bacpac.go

@@ -37,7 +37,7 @@ func (m *bacpac) BringOnline(
 	m.setDefaultDatabaseToMaster(options.Username, query)
 
 	m.RunCommand([]string{
-		"./root/.dotnet/tools/sqlpackage",
+		"./.dotnet/tools/sqlpackage",
 		"/Diagnostics:true",
 		"/Action:import",
 		"/SourceFile:" + m.CopyToLocation() + "/" + options.Filename,
@@ -63,12 +63,28 @@ func (m *bacpac) installSqlPackage() {
 	}
 
 	//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", "dotnet-install.sh"})
-	m.RunCommand([]string{"chmod", "+x", "./dotnet-install.sh"})
-	m.RunCommand([]string{"./dotnet-install.sh"})
-	m.RunCommand([]string{"/root/.dotnet/dotnet", "tool", "install", "-g", "microsoft.sqlpackage"})
+	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"})
+
+	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"})
 }
 
 func (m *bacpac) RunCommand(s []string) ([]byte, []byte) {
-	return m.controller.RunCmdInContainer(m.containerId, s)
+	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{})
+}
+
+func (m *bacpac) RunCommandAsRoot(s []string) ([]byte, []byte) {
+	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{
+		User: "root",
+		Env:  nil,
+	})
 }