Move vendir.yml to the root of the repo (#60)

aknysh · web-flow · commit 63b99a8f7f8e · 2020-11-18T13:05:15.000-05:00
diff --git a/.dockerignore b/.dockerignore
@@ -17,3 +17,4 @@
 **/build-harness
 
 *.lock.*
+.vendir-tmp
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ build-harness
 .idea
 *.iml
 *.lock.*
+.vendir-tmp
diff --git a/Dockerfile b/Dockerfile
@@ -79,6 +79,6 @@ COPY --from=cli /usr/cli/$CLI_NAME /usr/local/bin
 
 COPY rootfs/ /
 COPY stacks/ /stacks/
-COPY vendor/ /vendor/
+COPY vendir.yml /vendir.yml
 
 WORKDIR /
diff --git a/cli/main.variant b/cli/main.variant
@@ -56,7 +56,7 @@ option "config-dir" {
 }
 
 option "vendor-config-path" {
-  default     = "./vendor/vendir.yml"
+  default     = "./vendir.yml"
   description = "Path to the vendor configuration file"
   type        = string
 }
diff --git a/vendir.yml b/vendir.yml

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ option "config-dir" {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`option "vendor-config-path" {`
`59`		`- default = "./vendor/vendir.yml"`
	`59`	`+ default = "./vendir.yml"`
`60`	`60`	`description = "Path to the vendor configuration file"`
`61`	`61`	`type = string`
`62`	`62`	`}`