Skip to content

Update git ipc socket search path #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stuartleeks merged 1 commit into from
Mar 15, 2023
Merged

Update git ipc socket search path #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions internal/pkg/devcontainers/dockerutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,18 @@ func ExecInDevContainer(containerID string, workDir string, args []string) error
fmt.Printf("Warning; Failed to get REMOTE_CONTAINERS_IPC: %s\n", err)
fmt.Println("Continuing without setting REMOTE_CONTAINERS_IPC...")
}
statusWriter.Printf("Getting VSCODE_GIT_IPC_HANDLE")
vscodeGitIpcSock, err := getGitIpcSock(containerID)
if err != nil {
vscodeGitIpcSock = ""
fmt.Printf("Warning; Failed to get VSCODE_GIT_IPC_HANDLE: %s\n", err)
statusWriter.Printf("Getting container User ID")
vscodeGitIpcSock := ""
userID, err := getContainerUserID(containerID, userName)
if err == nil {
statusWriter.Printf("Getting VSCODE_GIT_IPC_HANDLE")
vscodeGitIpcSock, err = getGitIpcSock(containerID, userID)
if err != nil {
fmt.Printf("Warning; Failed to get VSCODE_GIT_IPC_HANDLE: %s\n", err)
fmt.Println("Continuing without setting VSCODE_GIT_IPC_HANDLE...")
}
} else {
fmt.Printf("Warning; Failed to get container User ID: %s\n", err)
fmt.Println("Continuing without setting VSCODE_GIT_IPC_HANDLE...")
}

Expand Down Expand Up @@ -395,8 +402,8 @@ func getVscodeIpcSock(containerID string) (string, error) {
func getRemoteContainersIpcSock(containerID string) (string, error) {
return getLatestFileMatch(containerID, "\"${TMPDIR:-/tmp}\"/vscode-remote-containers-ipc-*")
}
func getGitIpcSock(containerID string) (string, error) {
return getLatestFileMatch(containerID, "\"${TMPDIR:-/tmp}\"/vscode-git-*")
func getGitIpcSock(containerID string, userID string) (string, error) {
return getLatestFileMatch(containerID, fmt.Sprintf("\"${TMPDIR:-/tmp}\"/user/%s/vscode-git-*", userID))
}

// getLatestFileMatch lists files matching `pattern` in the container and returns the latest filename
Expand Down Expand Up @@ -432,6 +439,25 @@ func getContainerEnvVar(containerID string, varName string) (string, error) {
return string(buf), nil
}

// getContainerUserID gets the UID of the specified user in the container
func getContainerUserID(containerID string, userName string) (string, error) {

dockerArgs := []string{"exec", containerID, "bash", "-c", fmt.Sprintf("id -u %s", userName)}
dockerCmd := exec.Command("docker", dockerArgs...)
buf, err := dockerCmd.CombinedOutput()
if err != nil {
errMessage := string(buf)
return "", fmt.Errorf("Docker exec error: %s (%s)", err, strings.TrimSpace(errMessage))
}

output := string(buf)
lines := strings.Split(output, "\n")
if len(lines) <= 0 {
return "", nil
}
return strings.TrimSpace(lines[0]), nil
}

func testContainerPathExists(containerID string, path string) (bool, error) {
dockerArgs := []string{"exec", containerID, "bash", "-c", fmt.Sprintf("[[ -d %s ]]; echo $?", path)}
dockerCmd := exec.Command("docker", dockerArgs...)
Expand Down