Skip to content

Commit

Permalink
Add checking UID and GID upon 'ducker build'. Also overrides UID or G… (
Browse files Browse the repository at this point in the history
#26)

* Add checking UID and GID upon 'ducker build'. Also overrides UID or GID when '--build-arg UID' or '--build-arg GID' is presented in config.

* Add checking '--build-arg UID' or '--build-arg GID' in CLI arguments
  • Loading branch information
JeiKeiLim authored Jun 21, 2023
1 parent cd5789f commit a385508
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.6
0.1.7
16 changes: 15 additions & 1 deletion cmd/ducker/ducker.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,24 @@ func dockerBuild(ctx *cli.Context, dockerTag string) {
localConfig := readDefaultLocalConfig()

buildArgs := ctx.String("args")
localConfigBuildArgs := localConfig.GetBuildArg()

// Check if localConfig or buildArgs includes --build-arg UID
uidArgs := ""
if !strings.Contains(localConfigBuildArgs, "--build-arg UID") &&
!strings.Contains(buildArgs, "--build-arg UID") {
uidArgs += "--build-arg UID=" + getTerminalCmdOut("id", "-u")
}
// Check if localConfig or buildArgs includes --build-arg GID
if !strings.Contains(localConfigBuildArgs, "--build-arg GID") &&
!strings.Contains(buildArgs, "--build-arg GID") {
uidArgs += " --build-arg GID=" + getTerminalCmdOut("id", "-g")
}

buildCmd := "docker build . -t " + dockerTag
buildCmd += " -f " + dockerFilePath
buildCmd += " " + localConfig.GetBuildArg()
buildCmd += " " + localConfigBuildArgs
buildCmd += " " + uidArgs

if buildArgs != "" {
buildCmd += " " + buildArgs
Expand Down
2 changes: 0 additions & 2 deletions cmd/ducker/local_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ func getDefaultLocalConfig() LocalConfig {
"--network host",
},
Build_Arg: []string{
"--build-arg UID=" + getTerminalCmdOut("id", "-u"),
"--build-arg GID=" + getTerminalCmdOut("id", "-g"),
},
Default_Shell: "zsh",
Mount_PWD: true,
Expand Down

0 comments on commit a385508

Please sign in to comment.