Skip to content

Commit 8ad40eb

Browse files
mafredrimafredri
authored
Merge branch 'main' into mafredri/fix-docker-config-path
2 parents 167af18 + aa73795 commit 8ad40eb

File tree

8 files changed

+362
-51
lines changed

8 files changed

+362
-51
lines changed

‎devcontainer/devcontainer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,11 @@ func ImageFromDockerfile(dockerfileContent string) (name.Reference, error) {
400400
arg = strings.TrimSpace(arg)
401401
if strings.Contains(arg, "=") {
402402
parts := strings.SplitN(arg, "=", 2)
403-
key, err := lexer.ProcessWord(parts[0], args)
403+
key, _, err := lexer.ProcessWord(parts[0], shell.EnvsFromSlice(args))
404404
if err != nil {
405405
return nil, fmt.Errorf("processing %q: %w", line, err)
406406
}
407-
val, err := lexer.ProcessWord(parts[1], args)
407+
val, _, err := lexer.ProcessWord(parts[1], shell.EnvsFromSlice(args))
408408
if err != nil {
409409
return nil, fmt.Errorf("processing %q: %w", line, err)
410410
}
@@ -421,7 +421,7 @@ func ImageFromDockerfile(dockerfileContent string) (name.Reference, error) {
421421
if imageRef == "" {
422422
return nil, fmt.Errorf("no FROM directive found")
423423
}
424-
imageRef, err := lexer.ProcessWord(imageRef, args)
424+
imageRef, _, err := lexer.ProcessWord(imageRef, shell.EnvsFromSlice(args))
425425
if err != nil {
426426
return nil, fmt.Errorf("processing %q: %w", imageRef, err)
427427
}

‎envbuilder.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,11 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro
530530
if opts.CacheRepo != "" {
531531
destinations = append(destinations, opts.CacheRepo)
532532
}
533+
534+
buildSecrets := options.GetBuildSecrets(os.Environ())
535+
// Ensure that build secrets do not make it into the runtime environment or the setup script:
536+
options.ClearBuildSecretsFromProcessEnvironment()
537+
533538
kOpts := &config.KanikoOptions{
534539
// Boilerplate!
535540
CustomPlatform: platforms.Format(platforms.Normalize(platforms.DefaultSpec())),
@@ -554,6 +559,7 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro
554559
},
555560
ForceUnpack: true,
556561
BuildArgs: buildParams.BuildArgs,
562+
BuildSecrets: buildSecrets,
557563
CacheRepo: opts.CacheRepo,
558564
Cache: opts.CacheRepo != "" || opts.BaseImageCacheDir != "",
559565
DockerfilePath: buildParams.DockerfilePath,

‎go.mod‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22.4
44

55
// There are a few options we need added to Kaniko!
66
// See: https://github.com/GoogleContainerTools/kaniko/compare/main...coder:kaniko:main
7-
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20240925122543-caa18967f374
7+
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20241028054616-350cbb820e05
88

99
// Required to import codersdk due to gvisor dependency.
1010
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374
@@ -16,11 +16,11 @@ require (
1616
github.com/chainguard-dev/git-urls v1.0.2
1717
github.com/coder/coder/v2 v2.10.1-0.20240704130443-c2d44d16a352
1818
github.com/coder/retry v1.5.1
19-
github.com/coder/serpent v0.7.0
19+
github.com/coder/serpent v0.8.0
2020
github.com/containerd/platforms v0.2.1
2121
github.com/distribution/distribution/v3 v3.0.0-alpha.1
22-
github.com/docker/cli v27.2.0+incompatible
23-
github.com/docker/docker v26.1.5+incompatible
22+
github.com/docker/cli v27.2.1+incompatible
23+
github.com/docker/docker v27.3.1+incompatible
2424
github.com/fatih/color v1.17.0
2525
github.com/gliderlabs/ssh v0.3.7
2626
github.com/go-git/go-billy/v5 v5.5.0
@@ -31,7 +31,7 @@ require (
3131
github.com/hashicorp/go-multierror v1.1.1
3232
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
3333
github.com/mattn/go-isatty v0.0.20
34-
github.com/moby/buildkit v0.13.1
34+
github.com/moby/buildkit v0.16.0
3535
github.com/otiai10/copy v1.14.0
3636
github.com/prometheus/procfs v0.15.1
3737
github.com/sirupsen/logrus v1.9.3
@@ -100,25 +100,22 @@ require (
100100
github.com/cespare/xxhash/v2 v2.2.0 // indirect
101101
github.com/charmbracelet/lipgloss v0.8.0 // indirect
102102
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
103-
github.com/cilium/ebpf v0.12.3 // indirect
104103
github.com/cloudflare/circl v1.3.7 // indirect
105104
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect
106105
github.com/coder/quartz v0.1.0 // indirect
107106
github.com/coder/terraform-provider-coder v0.23.0 // indirect
108107
github.com/containerd/cgroups v1.1.0 // indirect
109-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
110-
github.com/containerd/containerd v1.7.19 // indirect
108+
github.com/containerd/containerd v1.7.21 // indirect
111109
github.com/containerd/containerd/api v1.7.19 // indirect
112110
github.com/containerd/continuity v0.4.3 // indirect
113111
github.com/containerd/errdefs v0.1.0 // indirect
114112
github.com/containerd/fifo v1.1.0 // indirect
115113
github.com/containerd/log v0.1.0 // indirect
116114
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
117115
github.com/containerd/ttrpc v1.2.5 // indirect
118-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
116+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
119117
github.com/coreos/go-iptables v0.6.0 // indirect
120118
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
121-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
122119
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
123120
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
124121
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
@@ -151,7 +148,7 @@ require (
151148
github.com/golang/protobuf v1.5.4 // indirect
152149
github.com/google/btree v1.1.2 // indirect
153150
github.com/google/nftables v0.2.0 // indirect
154-
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
151+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
155152
github.com/gorilla/handlers v1.5.1 // indirect
156153
github.com/gorilla/mux v1.8.1 // indirect
157154
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
@@ -164,7 +161,7 @@ require (
164161
github.com/hashicorp/go-version v1.7.0 // indirect
165162
github.com/hashicorp/golang-lru v1.0.2 // indirect
166163
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
167-
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
164+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
168165
github.com/hashicorp/hcl/v2 v2.21.0 // indirect
169166
github.com/hashicorp/logutils v1.0.0 // indirect
170167
github.com/hashicorp/terraform-plugin-go v0.12.0 // indirect
@@ -202,11 +199,12 @@ require (
202199
github.com/moby/patternmatcher v0.6.0 // indirect
203200
github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 // indirect
204201
github.com/moby/sys/mount v0.3.3 // indirect
205-
github.com/moby/sys/mountinfo v0.7.1 // indirect
202+
github.com/moby/sys/mountinfo v0.7.2 // indirect
206203
github.com/moby/sys/sequential v0.5.0 // indirect
207-
github.com/moby/sys/signal v0.7.0 // indirect
204+
github.com/moby/sys/signal v0.7.1 // indirect
208205
github.com/moby/sys/symlink v0.2.0 // indirect
209-
github.com/moby/sys/user v0.1.0 // indirect
206+
github.com/moby/sys/user v0.3.0 // indirect
207+
github.com/moby/sys/userns v0.1.0 // indirect
210208
github.com/moby/term v0.5.0 // indirect
211209
github.com/morikuni/aec v1.0.0 // indirect
212210
github.com/muesli/reflow v0.3.0 // indirect
@@ -245,6 +243,7 @@ require (
245243
github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 // indirect
246244
github.com/tcnksm/go-httpstat v0.2.0 // indirect
247245
github.com/tinylib/msgp v1.1.8 // indirect
246+
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
248247
github.com/twpayne/go-vfs/v5 v5.0.4 // indirect
249248
github.com/u-root/uio v0.0.0-20240209044354-b3d14b93376a // indirect
250249
github.com/valyala/fasthttp v1.55.0 // indirect

0 commit comments

Comments
 (0)