JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

solver: rename solver-next to solver 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-05-10 22:58:41 -07:00
parent 3efe262d8f
commit 71f5e6dd21
45 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache/remotecache/export.go vendored
View File

@ -12,7 +12,7 @@ import (
"github.com/docker/distribution/manifest" "github.com/docker/distribution/manifest"
v1 "github.com/moby/buildkit/cache/remotecache/v1" v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/contentutil"
"github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/util/push" "github.com/moby/buildkit/util/push"

2
cache/remotecache/import.go vendored
View File

@ -12,7 +12,7 @@ import (
v1 "github.com/moby/buildkit/cache/remotecache/v1" v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
"github.com/moby/buildkit/session/auth" "github.com/moby/buildkit/session/auth"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/contentutil"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
cache/remotecache/v1/cachestorage.go vendored
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"

2
cache/remotecache/v1/chains.go vendored
View File

@ -4,7 +4,7 @@ import (
"time" "time"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
cache/remotecache/v1/chains_test.go vendored
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
cache/remotecache/v1/parse.go vendored
View File

@ -3,7 +3,7 @@ package cacheimport
import ( import (
"encoding/json" "encoding/json"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/contentutil"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"

2
cache/remotecache/v1/utils.go vendored
View File

@ -5,7 +5,7 @@ import (
"sort" "sort"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"

2
cmd/buildkitd/main.go
View File

@ -23,7 +23,7 @@ import (
"github.com/moby/buildkit/frontend/dockerfile" "github.com/moby/buildkit/frontend/dockerfile"
"github.com/moby/buildkit/frontend/gateway" "github.com/moby/buildkit/frontend/gateway"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver-next/boltdbcachestorage" "github.com/moby/buildkit/solver/boltdbcachestorage"
"github.com/moby/buildkit/util/appcontext" "github.com/moby/buildkit/util/appcontext"
"github.com/moby/buildkit/util/appdefaults" "github.com/moby/buildkit/util/appdefaults"
"github.com/moby/buildkit/util/profiler" "github.com/moby/buildkit/util/profiler"

4
control/control.go
View File

@ -11,8 +11,8 @@ import (
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
"github.com/moby/buildkit/session/grpchijack" "github.com/moby/buildkit/session/grpchijack"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver-next/llbsolver" "github.com/moby/buildkit/solver/llbsolver"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
frontend/dockerfile/dockerfile.go
View File

@ -5,7 +5,7 @@ import (
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/frontend/dockerfile/builder" "github.com/moby/buildkit/frontend/dockerfile/builder"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
) )
func NewDockerfileFrontend() frontend.Frontend { func NewDockerfileFrontend() frontend.Frontend {

2
frontend/dockerfile/forward.go
View File

@ -7,7 +7,7 @@ import (
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/frontend/gateway/client" "github.com/moby/buildkit/frontend/gateway/client"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
frontend/frontend.go
View File

@ -6,7 +6,7 @@ import (
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
"github.com/moby/buildkit/executor" "github.com/moby/buildkit/executor"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )

2
frontend/gateway/gateway.go
View File

@ -18,7 +18,7 @@ import (
pb "github.com/moby/buildkit/frontend/gateway/pb" pb "github.com/moby/buildkit/frontend/gateway/pb"
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/tracing" "github.com/moby/buildkit/util/tracing"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
solver-next/boltdbcachestorage/storage.go → solver/boltdbcachestorage/storage.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
solver-next/boltdbcachestorage/storage_test.go → solver/boltdbcachestorage/storage_test.go
View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

0
solver-next/cache_test.go → solver/cache_test.go
View File

0
solver-next/cachekey.go → solver/cachekey.go
View File

0
solver-next/cachemanager.go → solver/cachemanager.go
View File

0
solver-next/cachestorage.go → solver/cachestorage.go
View File

0
solver-next/cachestorage_testsuite.go → solver/cachestorage_testsuite.go
View File

0
solver-next/combinedcache.go → solver/combinedcache.go
View File

2
solver-next/edge.go → solver/edge.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/moby/buildkit/solver-next/internal/pipe" "github.com/moby/buildkit/solver/internal/pipe"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

0
solver-next/exporter.go → solver/exporter.go
View File

0
solver-next/index.go → solver/index.go
View File

0
solver-next/index_test.go → solver/index_test.go
View File

0
solver-next/internal/pipe/pipe.go → solver/internal/pipe/pipe.go
View File

0
solver-next/internal/pipe/pipe_test.go → solver/internal/pipe/pipe_test.go
View File

0
solver-next/jobs.go → solver/jobs.go
View File

2
solver-next/llbsolver/bridge.go → solver/llbsolver/bridge.go
View File

@ -11,7 +11,7 @@ import (
"github.com/moby/buildkit/cache/remotecache" "github.com/moby/buildkit/cache/remotecache"
"github.com/moby/buildkit/executor" "github.com/moby/buildkit/executor"
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/tracing" "github.com/moby/buildkit/util/tracing"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
solver-next/llbsolver/ops/build.go → solver/llbsolver/ops/build.go
View File

@ -9,7 +9,7 @@ import (
"github.com/moby/buildkit/client/llb" "github.com/moby/buildkit/client/llb"
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

4
solver-next/llbsolver/ops/exec.go → solver/llbsolver/ops/exec.go
View File

@ -12,8 +12,8 @@ import (
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
"github.com/moby/buildkit/executor" "github.com/moby/buildkit/executor"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver-next/llbsolver" "github.com/moby/buildkit/solver/llbsolver"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/progress/logs" "github.com/moby/buildkit/util/progress/logs"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"

2
solver-next/llbsolver/ops/source.go → solver/llbsolver/ops/source.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/source" "github.com/moby/buildkit/source"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"

2
solver-next/llbsolver/result.go → solver/llbsolver/result.go
View File

@ -9,7 +9,7 @@ import (
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
"github.com/moby/buildkit/cache/contenthash" "github.com/moby/buildkit/cache/contenthash"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"

2
solver-next/llbsolver/solver.go → solver/llbsolver/solver.go
View File

@ -10,7 +10,7 @@ import (
"github.com/moby/buildkit/exporter" "github.com/moby/buildkit/exporter"
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/worker" "github.com/moby/buildkit/worker"
"github.com/pkg/errors" "github.com/pkg/errors"

2
solver-next/llbsolver/vertex.go → solver/llbsolver/vertex.go
View File

@ -3,7 +3,7 @@ package llbsolver
import ( import (
"strings" "strings"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/source" "github.com/moby/buildkit/source"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

0
solver-next/memorycachestorage.go → solver/memorycachestorage.go
View File

0
solver-next/memorycachestorage_test.go → solver/memorycachestorage_test.go
View File

0
solver-next/progress.go → solver/progress.go
View File

0
solver-next/result.go → solver/result.go
View File

2
solver-next/scheduler.go → solver/scheduler.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/moby/buildkit/solver-next/internal/pipe" "github.com/moby/buildkit/solver/internal/pipe"
"github.com/moby/buildkit/util/cond" "github.com/moby/buildkit/util/cond"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

0
solver-next/scheduler_test.go → solver/scheduler_test.go
View File

0
solver-next/types.go → solver/types.go
View File

4
worker/base/worker.go
View File

@ -29,8 +29,8 @@ import (
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
"github.com/moby/buildkit/session" "github.com/moby/buildkit/session"
"github.com/moby/buildkit/snapshot" "github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver-next/llbsolver/ops" "github.com/moby/buildkit/solver/llbsolver/ops"
"github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/source" "github.com/moby/buildkit/source"
"github.com/moby/buildkit/source/containerimage" "github.com/moby/buildkit/source/containerimage"

2
worker/result.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
solver "github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
) )
func NewWorkerRefResult(ref cache.ImmutableRef, worker Worker) solver.Result { func NewWorkerRefResult(ref cache.ImmutableRef, worker Worker) solver.Result {

2
worker/worker.go
View File

@ -9,7 +9,7 @@ import (
"github.com/moby/buildkit/executor" "github.com/moby/buildkit/executor"
"github.com/moby/buildkit/exporter" "github.com/moby/buildkit/exporter"
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/solver-next" "github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )