docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-16 16:37:10 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: make dockerfile relative to context

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2019-05-24 15:23:16 -07:00
parent 4e61674ac8
commit f1fd9a274b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bake/bake.go
View File

@ -4,10 +4,12 @@ import (
"context" "context"
"io/ioutil" "io/ioutil"
"os" "os"
"path"
"strings" "strings"
"github.com/docker/buildx/build" "github.com/docker/buildx/build"
"github.com/docker/buildx/util/platformutil" "github.com/docker/buildx/util/platformutil"
"github.com/docker/docker/pkg/urlutil"
"github.com/moby/buildkit/session/auth/authprovider" "github.com/moby/buildkit/session/auth/authprovider"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -275,6 +277,10 @@ func toBuildOpt(t Target) (*build.Options, error) {
dockerfilePath = *t.Dockerfile dockerfilePath = *t.Dockerfile
} }
if !isRemoteResource(contextPath) && !path.IsAbs(dockerfilePath) {
dockerfilePath = path.Join(contextPath, dockerfilePath)
}
bo := &build.Options{ bo := &build.Options{
Inputs: build.Inputs{ Inputs: build.Inputs{
ContextPath: contextPath, ContextPath: contextPath,
@ -394,3 +400,7 @@ func removeDupes(s []string) []string {
} }
return s[:i] return s[:i]
} }
func isRemoteResource(str string) bool {
return urlutil.IsGitURL(str) || urlutil.IsURL(str)
}

2
vendor/modules.txt vendored
View File

@ -151,8 +151,8 @@ github.com/docker/distribution/registry/storage/cache/memory
github.com/docker/distribution/uuid github.com/docker/distribution/uuid
github.com/docker/distribution/metrics github.com/docker/distribution/metrics
# github.com/docker/docker v1.14.0-0.20190410063227-3998dffb806f3887f804b813069f59bc14a7f3c1 # github.com/docker/docker v1.14.0-0.20190410063227-3998dffb806f3887f804b813069f59bc14a7f3c1
github.com/docker/docker/client
github.com/docker/docker/pkg/urlutil github.com/docker/docker/pkg/urlutil
github.com/docker/docker/client
github.com/docker/docker/api/types github.com/docker/docker/api/types
github.com/docker/docker/api/types/container github.com/docker/docker/api/types/container
github.com/docker/docker/api/types/network github.com/docker/docker/api/types/network