fix: replicate docker container permissions

theobori · Oct 25, 2023 · 85deeb5 · 85deeb5
1 parent 7134d0d
commit 85deeb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/internal/docker/docker.go b/internal/docker/docker.go
@@ -24,7 +24,7 @@ package docker
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -105,17 +105,12 @@ func ExecContainer(
 	cli *client.Client,
 	command *strslice.StrSlice,
 	mounts *[]mount.Mount,
-	user string,
 ) error {
 	config := container.Config{
 		Cmd:   *command,
 		Image: DockerImage,
 	}
 
-	if user != "" {
-		config.User = user
-	}
-
 	resp, err := cli.ContainerCreate(
 		ctx,
 		&config,
@@ -153,7 +148,7 @@ func DockerVolumeCopy(ctx context.Context, cli *client.Client, vSrc string, vDes
 				Source: vDest,
 				Target: "/dest",
 			},
-		}, "",
+		},
 	)
 }
 
@@ -182,7 +177,7 @@ func DockerTryPull(ctx context.Context, cli *client.Client, id string) (bool, er
 
 	defer out.Close()
 
-	if _, err := ioutil.ReadAll(out); err != nil {
+	if _, err := io.ReadAll(out); err != nil {
 		return false, err
 	}
 

diff --git a/internal/point/tarball.go b/internal/point/tarball.go
@@ -26,7 +26,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -134,7 +133,7 @@ func (t *TarballPoint) From(vSrc *[]string) error {
 					Source:      tmpVolumeName,
 					Target:      "/dest",
 				},
-			}, "",
+			},
 		)
 
 		if err != nil {
@@ -169,7 +168,6 @@ func (t *TarballPoint) From(vSrc *[]string) error {
 				Target:      "/dest",
 			},
 		},
-		fmt.Sprintf("%d:%d", os.Getuid(), os.Getegid()),
 	)
 
 	if err != nil {
@@ -219,7 +217,7 @@ func (t *TarballPoint) To(vDest *[]string) error {
 					Source:      volume,
 					Target:      "/dest",
 				},
-			}, "",
+			},
 		)
 
 		if err != nil {