beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gitutils: remove checkout directory on error

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2017-12-08 11:51:10 -08:00
parent a602525524
commit 4ea320cb8e
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
builder/remotecontext/git/gitutils.go
View file

@ -32,7 +32,7 @@ func Clone(remoteURL string) (string, error) {
return cloneGitRepo(repo)
}
func cloneGitRepo(repo gitRepo) (string, error) {
func cloneGitRepo(repo gitRepo) (checkoutDir string, err error) {
fetch := fetchArgs(repo.remote, repo.ref)
root, err := ioutil.TempDir("", "docker-build-git")
@ -40,6 +40,12 @@ func cloneGitRepo(repo gitRepo) (string, error) {
return "", err
}
defer func() {
if err != nil {
os.RemoveAll(root)
}
}()
if out, err := gitWithinDir(root, "init"); err != nil {
return "", errors.Wrapf(err, "failed to init repo at %s: %s", root, out)
}
@ -54,7 +60,7 @@ func cloneGitRepo(repo gitRepo) (string, error) {
return "", errors.Wrapf(err, "error fetching: %s", output)
}
root, err = checkoutGit(root, repo.ref, repo.subdir)
checkoutDir, err = checkoutGit(root, repo.ref, repo.subdir)
if err != nil {
return "", err
}
@ -66,7 +72,7 @@ func cloneGitRepo(repo gitRepo) (string, error) {
return "", errors.Wrapf(err, "error initializing submodules: %s", output)
}
return root, nil
return checkoutDir, nil
}
func parseRemoteURL(remoteURL string) (gitRepo, error) {

20
builder/remotecontext/git/gitutils_test.go
View file

@ -234,17 +234,17 @@ func TestCheckoutGit(t *testing.T) {
if c.fail {
assert.Error(t, err)
continue
} else {
}
require.NoError(t, err)
defer os.RemoveAll(r)
if c.submodule {
b, err := ioutil.ReadFile(filepath.Join(r, "sub/subfile"))
require.NoError(t, err)
if c.submodule {
b, err := ioutil.ReadFile(filepath.Join(r, "sub/subfile"))
require.NoError(t, err)
assert.Equal(t, "subcontents", string(b))
} else {
_, err := os.Stat(filepath.Join(r, "sub/subfile"))
require.Error(t, err)
require.True(t, os.IsNotExist(err))
}
assert.Equal(t, "subcontents", string(b))
} else {
_, err := os.Stat(filepath.Join(r, "sub/subfile"))
require.Error(t, err)
require.True(t, os.IsNotExist(err))
}
b, err := ioutil.ReadFile(filepath.Join(r, "Dockerfile"))