grim/convey

merging

2018-02-19, Gary Kramlich
9c6cba1620e2
Parents b9170a94fe4d48f6379f7d7f
Children 335eaa5698de
merging
3 files changed, 10 insertions(+), 2 deletions(-)
  • +1 -1
    convey.yml
  • +8 -0
    docker/import.go
  • +1 -1
    path/path_test.go
    • --- a/convey.yml Mon Feb 19 15:36:05 2018 -0600
    +++ b/convey.yml Mon Feb 19 15:39:34 2018 -0600
    @@ -8,7 +8,7 @@
    import:
    type: docker/import
    files:
    - - .
    + - ./
    export:
    type: docker/export
    files:
    --- a/docker/import.go Mon Feb 19 15:36:05 2018 -0600
    +++ b/docker/import.go Mon Feb 19 15:39:34 2018 -0600
    @@ -55,6 +55,14 @@
    return err
    }
    + if realSrc == st.CfgPath {
    + realSrc = "."
    + }
    +
    + if dest == "." {
    + dest = ""
    + }
    +
    cmdv := []string{
    "cp",
    realSrc,
    --- a/path/path_test.go Mon Feb 19 15:36:05 2018 -0600
    +++ b/path/path_test.go Mon Feb 19 15:39:34 2018 -0600
    @@ -64,6 +64,6 @@
    Expect(err).To(BeNil())
    path, err := Traverses(wd, ".")
    - Expect(path).To(Equal("."))
    + Expect(path).To(Equal(wd))
    Expect(err).To(BeNil())
    }