Skip to content

Commit 43b5b37

Browse files
authored
fix: revert setting default UserID and GroupID to 0:0 (#202)
1 parent d43350f commit 43b5b37

File tree

3 files changed

+71
-3
lines changed

3 files changed

+71
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.3
66

77
// There are a few options we need added to Kaniko!
88
// See: https://github.com/GoogleContainerTools/kaniko/compare/main...coder:kaniko:main
9-
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20240520100029-ba712f28f434
9+
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20240520141539-224e9a03f543
1010

1111
require (
1212
cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
121121
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
122122
github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
123123
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
124-
github.com/coder/kaniko v0.0.0-20240520100029-ba712f28f434 h1:aqvehPc9tz7YZhlA/w67SMB2GG0dYYMPhFWQf40k3Jg=
125-
github.com/coder/kaniko v0.0.0-20240520100029-ba712f28f434/go.mod h1:YMK7BlxerzLlMwihGxNWUaFoN9LXCij4P+w/8/fNlcM=
124+
github.com/coder/kaniko v0.0.0-20240520141539-224e9a03f543 h1:6SZ720cpgKywSWykyImM7kjgdB7cKS8Ydk65D8/WjWA=
125+
github.com/coder/kaniko v0.0.0-20240520141539-224e9a03f543/go.mod h1:YMK7BlxerzLlMwihGxNWUaFoN9LXCij4P+w/8/fNlcM=
126126
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs=
127127
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
128128
github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=

integration/integration_test.go

+68
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,74 @@ func TestInitScriptInitCommand(t *testing.T) {
9393
require.NoError(t, ctx.Err(), "init script did not execute for legacy env vars")
9494
}
9595

96+
func TestUidGid(t *testing.T) {
97+
t.Parallel()
98+
t.Run("MultiStage", func(t *testing.T) {
99+
t.Parallel()
100+
101+
dockerFile := fmt.Sprintf(`FROM %s AS builder
102+
RUN mkdir -p /myapp/somedir \
103+
&& touch /myapp/somedir/somefile \
104+
&& chown 123:123 /myapp/somedir \
105+
&& chown 321:321 /myapp/somedir/somefile
106+
107+
FROM %s
108+
COPY --from=builder /myapp /myapp
109+
RUN printf "%%s\n" \
110+
"0 0 /myapp/" \
111+
"123 123 /myapp/somedir" \
112+
"321 321 /myapp/somedir/somefile" \
113+
> /tmp/expected \
114+
&& stat -c "%%u %%g %%n" \
115+
/myapp/ \
116+
/myapp/somedir \
117+
/myapp/somedir/somefile \
118+
> /tmp/got \
119+
&& diff -u /tmp/got /tmp/expected`, testImageAlpine, testImageAlpine)
120+
srv := createGitServer(t, gitServerOptions{
121+
files: map[string]string{
122+
"Dockerfile": dockerFile,
123+
},
124+
})
125+
_, err := runEnvbuilder(t, options{env: []string{
126+
envbuilderEnv("GIT_URL", srv.URL),
127+
envbuilderEnv("DOCKERFILE_PATH", "Dockerfile"),
128+
}})
129+
require.NoError(t, err)
130+
})
131+
132+
t.Run("SingleStage", func(t *testing.T) {
133+
t.Parallel()
134+
135+
dockerFile := fmt.Sprintf(`FROM %s
136+
RUN mkdir -p /myapp/somedir \
137+
&& touch /myapp/somedir/somefile \
138+
&& chown 123:123 /myapp/somedir \
139+
&& chown 321:321 /myapp/somedir/somefile \
140+
&& printf "%%s\n" \
141+
"0 0 /myapp/" \
142+
"123 123 /myapp/somedir" \
143+
"321 321 /myapp/somedir/somefile" \
144+
> /tmp/expected \
145+
&& stat -c "%%u %%g %%n" \
146+
/myapp/ \
147+
/myapp/somedir \
148+
/myapp/somedir/somefile \
149+
> /tmp/got \
150+
&& diff -u /tmp/got /tmp/expected`, testImageAlpine)
151+
srv := createGitServer(t, gitServerOptions{
152+
files: map[string]string{
153+
"Dockerfile": dockerFile,
154+
},
155+
})
156+
_, err := runEnvbuilder(t, options{env: []string{
157+
envbuilderEnv("GIT_URL", srv.URL),
158+
envbuilderEnv("DOCKERFILE_PATH", "Dockerfile"),
159+
}})
160+
require.NoError(t, err)
161+
})
162+
}
163+
96164
func TestForceSafe(t *testing.T) {
97165
t.Parallel()
98166

0 commit comments

Comments
 (0)