Skip to content

Commit a385508

Browse files
authored
Add checking UID and GID upon 'ducker build'. Also overrides UID or G… (#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
1 parent cd5789f commit a385508

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.6
1+
0.1.7

cmd/ducker/ducker.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,24 @@ func dockerBuild(ctx *cli.Context, dockerTag string) {
6060
localConfig := readDefaultLocalConfig()
6161

6262
buildArgs := ctx.String("args")
63+
localConfigBuildArgs := localConfig.GetBuildArg()
64+
65+
// Check if localConfig or buildArgs includes --build-arg UID
66+
uidArgs := ""
67+
if !strings.Contains(localConfigBuildArgs, "--build-arg UID") &&
68+
!strings.Contains(buildArgs, "--build-arg UID") {
69+
uidArgs += "--build-arg UID=" + getTerminalCmdOut("id", "-u")
70+
}
71+
// Check if localConfig or buildArgs includes --build-arg GID
72+
if !strings.Contains(localConfigBuildArgs, "--build-arg GID") &&
73+
!strings.Contains(buildArgs, "--build-arg GID") {
74+
uidArgs += " --build-arg GID=" + getTerminalCmdOut("id", "-g")
75+
}
6376

6477
buildCmd := "docker build . -t " + dockerTag
6578
buildCmd += " -f " + dockerFilePath
66-
buildCmd += " " + localConfig.GetBuildArg()
79+
buildCmd += " " + localConfigBuildArgs
80+
buildCmd += " " + uidArgs
6781

6882
if buildArgs != "" {
6983
buildCmd += " " + buildArgs

cmd/ducker/local_config.go

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ func getDefaultLocalConfig() LocalConfig {
3232
"--network host",
3333
},
3434
Build_Arg: []string{
35-
"--build-arg UID=" + getTerminalCmdOut("id", "-u"),
36-
"--build-arg GID=" + getTerminalCmdOut("id", "-g"),
3735
},
3836
Default_Shell: "zsh",
3937
Mount_PWD: true,

0 commit comments

Comments
 (0)