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

Merge pull request #200 from tonistiigi/git-submodules 

git: fix checking out submodules
docker-18.09
Akihiro Suda 2017-12-11 12:01:35 +09:00 committed by GitHub
parent 8cc6bacfc4 2ce418ae7b
commit 950f05560f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/git/gitsource.go
View File

@ -244,7 +244,7 @@ func (gs *gitSourceHandler) Snapshot(ctx context.Context) (out cache.ImmutableRe
}
if doFetch {
args := []string{"fetch", "--recurse-submodules=yes"}
args := []string{"fetch"}
if !isCommitSHA(ref) { // TODO: find a branch from ls-remote?
args = append(args, "--depth=1", "--no-tags")
} else {
@ -306,7 +306,7 @@ func (gs *gitSourceHandler) Snapshot(ctx context.Context) (out cache.ImmutableRe
return nil, err
}
}
_, err = gitWithinDir(ctx, checkoutDir, "", "fetch", "--recurse-submodules=yes", "--depth=1", "origin", pullref)
_, err = gitWithinDir(ctx, checkoutDir, "", "fetch", "--depth=1", "origin", pullref)
if err != nil {
return nil, err
}
@ -314,12 +314,19 @@ func (gs *gitSourceHandler) Snapshot(ctx context.Context) (out cache.ImmutableRe
if err != nil {
return nil, errors.Wrapf(err, "failed to checkout remote %s", gs.src.Remote)
}
gitDir = checkoutDir
} else {
_, err = gitWithinDir(ctx, gitDir, checkoutDir, "checkout", ref, "--", ".")
if err != nil {
return nil, errors.Wrapf(err, "failed to checkout remote %s", gs.src.Remote)
}
}
_, err = gitWithinDir(ctx, gitDir, checkoutDir, "submodule", "update", "--init", "--recursive", "--depth=1")
if err != nil {
return nil, errors.Wrapf(err, "failed to update submodules for %s", gs.src.Remote)
}
lm.Unmount()
lm = nil
@ -359,14 +366,15 @@ func gitWithinDir(ctx context.Context, gitDir, workDir string, args ...string) (
if workDir != "" {
a = append(a, "--work-tree", workDir)
}
return git(ctx, append(a, args...)...)
return git(ctx, workDir, append(a, args...)...)
}
func git(ctx context.Context, args ...string) (*bytes.Buffer, error) {
func git(ctx context.Context, dir string, args ...string) (*bytes.Buffer, error) {
stdout, stderr := logs.NewLogStreams(ctx)
defer stdout.Close()
defer stderr.Close()
cmd := exec.CommandContext(ctx, "git", args...)
cmd.Dir = dir // some commands like submodule require this
buf := bytes.NewBuffer(nil)
cmd.Stdout = io.MultiWriter(stdout, buf)
cmd.Stderr = stderr

68
source/git/gitsource_test.go
View File

@ -15,6 +15,7 @@ import (
"github.com/moby/buildkit/cache/metadata"
"github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/source"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -40,7 +41,8 @@ func testRepeatedFetch(t *testing.T, keepGitDir bool) {
require.NoError(t, err)
defer os.RemoveAll(repodir)
setupGitRepo(t, repodir)
repodir, err = setupGitRepo(repodir)
require.NoError(t, err)
id := &source.GitIdentifier{Remote: repodir, KeepGitDir: keepGitDir}
@ -73,6 +75,10 @@ func testRepeatedFetch(t *testing.T, keepGitDir bool) {
require.Error(t, err)
require.True(t, os.IsNotExist(err))
_, err = os.Lstat(filepath.Join(dir, "sub/subfile"))
require.Error(t, err)
require.True(t, os.IsNotExist(err))
// second fetch returns same dir
id = &source.GitIdentifier{Remote: repodir, Ref: "master", KeepGitDir: keepGitDir}
@ -115,6 +121,11 @@ func testRepeatedFetch(t *testing.T, keepGitDir bool) {
require.NoError(t, err)
require.Equal(t, "baz\n", string(dt))
dt, err = ioutil.ReadFile(filepath.Join(dir, "sub/subfile"))
require.NoError(t, err)
require.Equal(t, "subcontents\n", string(dt))
}
func TestFetchBySHA(t *testing.T) {
@ -138,7 +149,8 @@ func testFetchBySHA(t *testing.T, keepGitDir bool) {
require.NoError(t, err)
defer os.RemoveAll(repodir)
setupGitRepo(t, repodir)
repodir, err = setupGitRepo(repodir)
require.NoError(t, err)
cmd := exec.Command("git", "rev-parse", "feature")
cmd.Dir = repodir
@ -175,6 +187,11 @@ func testFetchBySHA(t *testing.T, keepGitDir bool) {
require.NoError(t, err)
require.Equal(t, "baz\n", string(dt))
dt, err = ioutil.ReadFile(filepath.Join(dir, "sub/subfile"))
require.NoError(t, err)
require.Equal(t, "subcontents\n", string(dt))
}
func TestMultipleRepos(t *testing.T) {
@ -199,13 +216,14 @@ func testMultipleRepos(t *testing.T, keepGitDir bool) {
require.NoError(t, err)
defer os.RemoveAll(repodir)
setupGitRepo(t, repodir)
repodir, err = setupGitRepo(repodir)
require.NoError(t, err)
repodir2, err := ioutil.TempDir("", "buildkit-gitsource")
require.NoError(t, err)
defer os.RemoveAll(repodir2)
runShell(t, repodir2,
err = runShell(repodir2,
"git init",
"git config --local user.email test",
"git config --local user.name test",
@ -213,6 +231,7 @@ func testMultipleRepos(t *testing.T, keepGitDir bool) {
"git add xyz",
"git commit -m initial",
)
require.NoError(t, err)
id := &source.GitIdentifier{Remote: repodir, KeepGitDir: keepGitDir}
id2 := &source.GitIdentifier{Remote: repodir2, KeepGitDir: keepGitDir}
@ -290,8 +309,29 @@ func setupGitSource(t *testing.T, tmpdir string) source.Source {
return gs
}
func setupGitRepo(t *testing.T, dir string) {
runShell(t, dir,
func setupGitRepo(dir string) (string, error) {
subPath := filepath.Join(dir, "sub")
mainPath := filepath.Join(dir, "main")
if err := os.MkdirAll(subPath, 0700); err != nil {
return "", err
}
if err := os.MkdirAll(mainPath, 0700); err != nil {
return "", err
}
if err := runShell(filepath.Join(dir, "sub"),
"git init",
"git config --local user.email test",
"git config --local user.name test",
"echo subcontents > subfile",
"git add subfile",
"git commit -m initial",
); err != nil {
return "", err
}
if err := runShell(filepath.Join(dir, "main"),
"git init",
"git config --local user.email test",
"git config --local user.name test",
@ -305,14 +345,22 @@ func setupGitRepo(t *testing.T, dir string) {
"echo baz > ghi",
"git add ghi",
"git commit -m feature",
)
"git submodule add "+subPath+" sub",
"git add -A",
"git commit -m withsub",
); err != nil {
return "", err
}
return mainPath, nil
}
func runShell(t *testing.T, dir string, cmds ...string) {
func runShell(dir string, cmds ...string) error {
for _, args := range cmds {
cmd := exec.Command("sh", "-c", args)
cmd.Dir = dir
dt, err := cmd.CombinedOutput()
require.NoError(t, err, "command %v returned %s", args, dt)
if err := cmd.Run(); err != nil {
return errors.Wrapf(err, "error running %v", args)
}
}
return nil
}