Skip to content

Commit

Permalink
Merge pull request #215 from depot/revert-214-feat/compose-compatible…
Browse files Browse the repository at this point in the history
…-names
  • Loading branch information
jacobwgillespie authored Oct 27, 2023
2 parents 4cf44b2 + 61c593d commit c7bfdb2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 196 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/charmbracelet/bubbletea v0.24.2
github.com/charmbracelet/lipgloss v0.7.1
github.com/cli/safeexec v1.0.0
github.com/compose-spec/compose-go v1.6.0
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81
github.com/containerd/containerd v1.6.20
github.com/docker/buildx v0.10.3
Expand Down Expand Up @@ -72,6 +71,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/compose-spec/compose-go v1.6.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/containerd/ttrpc v1.1.1 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
Expand Down
13 changes: 0 additions & 13 deletions pkg/buildx/commands/bake.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/containerd/containerd/platforms"
"github.com/depot/cli/pkg/buildx/build"
"github.com/depot/cli/pkg/buildx/builder"
"github.com/depot/cli/pkg/compose"
"github.com/depot/cli/pkg/helpers"
"github.com/depot/cli/pkg/load"
depotprogress "github.com/depot/cli/pkg/progress"
Expand Down Expand Up @@ -410,18 +409,6 @@ func (t *LocalBakeValidator) Validate(ctx context.Context, _ []builder.Node, _ p
return
}

tags, err := compose.TargetTags(files)
if err != nil {
t.err = err
return
}

for target, opts := range targets {
if tag, ok := tags[target]; ok {
opts.Tags = tag
}
}

t.buildOpts, t.err = bake.TargetsToBuildOpt(targets, nil)
})

Expand Down
182 changes: 0 additions & 182 deletions pkg/compose/compose.go

This file was deleted.

0 comments on commit c7bfdb2

Please sign in to comment.